From 9b82530f516ea1e9acce99bee8735f416c11a0c9 Mon Sep 17 00:00:00 2001
From: "Michael \"Z\" Goddard" <mzgoddard@gmail.com>
Date: Fri, 4 May 2018 12:33:42 -0400
Subject: [PATCH] Use a constructor to create the execute cache objects

---
 src/engine/blocks.js  | 11 ++++++-----
 src/engine/execute.js | 31 ++++++++++++++++++++++++++-----
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/engine/blocks.js b/src/engine/blocks.js
index 9af98db59..fddd5d71d 100644
--- a/src/engine/blocks.js
+++ b/src/engine/blocks.js
@@ -876,21 +876,22 @@ class Blocks {
  * @param {string} blockId blockId for the desired execute cache
  * @return {object} execute cache object
  */
-BlocksExecuteCache.getCached = function (blocks, blockId) {
-    const block = blocks.getBlock(blockId);
-    if (typeof block === 'undefined') return null;
+BlocksExecuteCache.getCached = function (blocks, blockId, CacheType = Object) {
     let cached = blocks._cache._executeCached[blockId];
     if (typeof cached !== 'undefined') {
         return cached;
     }
 
-    cached = {
+    const block = blocks.getBlock(blockId);
+    if (typeof block === 'undefined') return null;
+
+    cached = new CacheType({
         _initialized: false,
         opcode: blocks.getOpcode(block),
         fields: blocks.getFields(block),
         inputs: blocks.getInputs(block),
         mutation: blocks.getMutation(block)
-    };
+    });
     blocks._cache._executeCached[blockId] = cached;
     return cached;
 };
diff --git a/src/engine/execute.js b/src/engine/execute.js
index f819b6df2..69468688e 100644
--- a/src/engine/execute.js
+++ b/src/engine/execute.js
@@ -118,6 +118,28 @@ const FieldKind = {
     DYNAMIC: 'DYNAMIC'
 };
 
+const BlockCached = function (cached) {
+    this._initialized = false;
+
+    this.opcode = cached.opcode;
+    this.fields = cached.fields;
+    this.inputs = cached.inputs;
+    this.mutation = cached.mutation;
+
+    this._isHat = false;
+    this._blockFunction = null;
+    this._definedBlockFunction = false;
+    this._isShadowBlock = false;
+    this._shadowValue = null;
+    this._fields = null;
+    this._fieldKind = FieldKind.NONE;
+    this._fieldVariable = null;
+    this._fieldList = null;
+    this._fieldBroadcastOption = null;
+    this._argValues = null;
+    this._inputs = null;
+};
+
 /**
  * Execute a block.
  * @param {!Sequencer} sequencer Which sequencer is executing.
@@ -132,12 +154,12 @@ const execute = function (sequencer, thread, recursiveCall) {
     const currentStackFrame = thread.peekStackFrame();
 
     let blockContainer = thread.blockContainer;
-    let block = blockContainer.getBlock(currentBlockId);
-    if (typeof block === 'undefined') {
+    let blockCached = BlocksExecuteCache.getCached(blockContainer, currentBlockId, BlockCached);;
+    if (blockCached === null) {
         blockContainer = runtime.flyoutBlocks;
-        block = blockContainer.getBlock(currentBlockId);
+        blockCached = BlocksExecuteCache.getCached(blockContainer, currentBlockId, BlockCached);
         // Stop if block or target no longer exists.
-        if (typeof block === 'undefined') {
+        if (blockCached === null) {
             // No block found: stop the thread; script no longer exists.
             sequencer.retireThread(thread);
             return;
@@ -158,7 +180,6 @@ const execute = function (sequencer, thread, recursiveCall) {
     // Blocks is modified in the editor these cached objects will be cleaned up
     // and new cached copies can be created. This lets us optimize this critical
     // path while keeping up to date with editor changes to a project.
-    const blockCached = BlocksExecuteCache.getCached(blockContainer, currentBlockId);
     if (blockCached._initialized !== true) {
         const {opcode, fields, inputs} = blockCached;