Add test with non-zero PUSH #[$] to solc-js tests

Author: clonker

test/externalTests/solc-js/asm-json.js

@@ -0,0 +1,45 @@
+const tape = require('tape');
+const fs = require('fs');
+const solc = require('../index.js');
+
+tape('ASM Json output consistency', function (t) {
+    t.test('Nested structure', function(st) {
+        const testdir = 'test/';
+        const output = JSON.parse(solc.compile(JSON.stringify({
+            language: 'Solidity',
+            settings: {
+                viaIR: true,
+                outputSelection: {
+                    '*': {
+                        '*': ['evm.legacyAssembly']
+                    }
+                }
+            },
+            sources: {
+                C: {
+                    content: fs.readFileSync(testdir + 'code_access_runtime.sol', 'utf8')
+                }
+            }
+        })));
+        st.ok(output);
+
+        function containsAssemblyItem(assemblyJSON, assemblyItem) {
+            if (Array.isArray(assemblyJSON))
+                return assemblyJSON.some(item => containsAssemblyItem(item, assemblyItem));
+            else if (typeof assemblyJSON === 'object' && assemblyJSON !== null) {
+                if (assemblyJSON.name === assemblyItem.name && assemblyJSON.value === assemblyItem.value)
+                    return true;
+                return Object.values(assemblyJSON).some(value => containsAssemblyItem(value, assemblyItem));
+            }
+            return false;
+        }
+
+        // regression test that there is indeed a negative subassembly index in there
+        // and it is based on a 64 bit uint
+        const targetObject = {
+            "name": "PUSH #[$]",
+            "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
+        };
+        st.equal(containsAssemblyItem(output["contracts"]["C"]["C"]["evm"]["legacyAssembly"], targetObject), true)
+    });
+});

test/externalTests/solc-js/solc-js.sh

@@ -48,6 +48,9 @@ function solcjs_test
     printLog "Copying contracts..."
     cp -Rf "$SOLCJS_INPUT_DIR/DAO" test/
 
+    printLog "Copying test with non-zero subassembly access"
+    cp -f "$TEST_DIR"/test/libsolidity/semanticTests/various/code_access_runtime.sol test/
+
     printLog "Copying SMTChecker tests..."
     # We do not copy all tests because that takes too long.
     cp -Rf "$TEST_DIR"/test/libsolidity/smtCheckerTests/external_calls test/smtCheckerTests/