rollback previous change and check locals on DUP

Author: ci-bot

libs/remix-debug/src/solidity-decoder/helpers/callTreeHelper.ts

@@ -194,6 +194,9 @@ export async function includeVariableDeclaration (tree: InternalCallTree, step,
     for (const variableDeclaration of variableDeclarations) {
       if (variableDeclaration) {
         try {
+          // check if already processed
+          if (tree.scopes[scopeId] && tree.scopes[scopeId].locals && tree.scopes[scopeId].locals[variableDeclaration.name]) continue
+
           const stack = tree.traceManager.getStackAt(step)
           // the stack length at this point is where the value of the new local variable will be stored.
           // so, either this is the direct value, or the offset in memory. That depends on the type.
@@ -253,21 +256,22 @@ export async function includeVariableDeclaration (tree: InternalCallTree, step,
               Without the fix below the second PUSH will register the var at index 4.
               That isn't a really good way of fixing this, need to find a better solution.
             */
+           /*
             try {
               const symbolicStack = tree.symbolicStackManager.getStackAtStep(step)
               if (symbolicStack && symbolicStack.length && symbolicStack[symbolicStack.length - 1] &&
                 symbolicStack && symbolicStack.length && symbolicStack[symbolicStack.length - 2]) {
                 const testDup = symbolicStack[symbolicStack.length - 1]
                 const testPush = symbolicStack[symbolicStack.length - 2]
                 if (testDup.originOp && testDup.kind && testDup.kind === 'intermediate' && testDup.originOp.startsWith('DUP') &&
-                      testPush.kind && testPush.kind === 'variable' && testPush.originStep === step - 2) {
+                      testPush.kind && (testPush.kind === 'variable' || testPush.kind === 'return_value')) {
                   console.warn('applying stack fix', step, symbolicStack)
                   stackIndex = stack.length - 1
                 }
               }
             } catch (e) {
               console.warn(e)
-            }
+            }*/
 
             // Bind variable to symbolic stack with appropriate lifecycle
             const variable = isReturnParamDeclaration ? existingReturnParam : newVar

libs/remix-debug/src/solidity-decoder/internalCallTree.ts

@@ -913,7 +913,7 @@ async function buildTree (tree: InternalCallTree, step, scopeId, isCreation, sou
       tree.scopes[scopeId].endExecutionLine = lineColumnPos && lineColumnPos.end ? lineColumnPos.end.line + 1 : undefined
       return { outStep: step + 1 }
     } else {
-      if (tree.includeLocalVariables && stepDetail.op && stepDetail.op.startsWith('PUSH')) {
+      if (tree.includeLocalVariables && stepDetail.op && (stepDetail.op.startsWith('PUSH') || stepDetail.op.startsWith('DUP'))) {
         try {
           await includeVariableDeclaration(tree, step, sourceLocation, scopeId, contractObj, generatedSources, address, blocksDefinition)
         } catch (e) {