Merge pull request #7018 from ethereum/compile_only_requested

Compile only requested sources and contracts

Changelog.md

@@ -10,6 +10,7 @@ Language Features:
 Compiler Features:
  * eWasm: Highly experimental eWasm output using ``--ewasm`` in the commandline interface or output selection of ``ewasm.wast`` in standard-json.
  * Metadata: Update the swarm hash, changes ``bzzr0`` to ``bzzr1`` and urls to use ``bzz-raw://``.
+ * Standard JSON Interface: Compile only selected sources and contracts.
 
 
 

libsolidity/interface/CompilerStack.cpp

@@ -398,13 +398,29 @@ bool CompilerStack::parseAndAnalyze()
 	return parse() && analyze();
 }
 
-bool CompilerStack::isRequestedContract(ContractDefinition const& _contract) const
+bool CompilerStack::isRequestedSource(string const& _sourceName) const
 {
 	return
 		m_requestedContractNames.empty() ||
-		m_requestedContractNames.count(_contract.fullyQualifiedName()) ||
-		m_requestedContractNames.count(_contract.name()) ||
-		m_requestedContractNames.count(":" + _contract.name());
+		m_requestedContractNames.count("") ||
+		m_requestedContractNames.count(_sourceName);
+}
+
+bool CompilerStack::isRequestedContract(ContractDefinition const& _contract) const
+{
+	/// In case nothing was specified in outputSelection.
+	if (m_requestedContractNames.empty())
+		return true;
+
+	for (auto const& key: vector<string>{"", _contract.sourceUnitName()})
+	{
+		auto const& it = m_requestedContractNames.find(key);
+		if (it != m_requestedContractNames.end())
+			if (it->second.count(_contract.name()) || it->second.count(""))
+				return true;
+	}
+
+	return false;
 }
 
 bool CompilerStack::compile()
@@ -900,6 +916,7 @@ void CompilerStack::resolveImports()
 	};
 
 	for (auto const& sourcePair: m_sources)
+		if (isRequestedSource(sourcePair.first))
 			toposort(&sourcePair.second);
 
 	swap(m_sourceOrder, sourceOrder);

libsolidity/interface/CompilerStack.h

@@ -42,6 +42,7 @@
 #include <functional>
 #include <memory>
 #include <ostream>
+#include <set>
 #include <string>
 #include <vector>
 
@@ -145,9 +146,12 @@ public:
 	/// Must be set before parsing.
 	void setEVMVersion(langutil::EVMVersion _version = langutil::EVMVersion{});
 
-	/// Sets the list of requested contract names. If empty, no filtering is performed and every contract
-	/// found in the supplied sources is compiled. Names are cleared iff @a _contractNames is missing.
-	void setRequestedContractNames(std::set<std::string> const& _contractNames = std::set<std::string>{}) {
+	/// Sets the requested contract names by source.
+	/// If empty, no filtering is performed and every contract
+	/// found in the supplied sources is compiled.
+	/// Names are cleared iff @a _contractNames is missing.
+	void setRequestedContractNames(std::map<std::string, std::set<std::string>> const& _contractNames = std::map<std::string, std::set<std::string>>{})
+	{
 		m_requestedContractNames = _contractNames;
 	}
 
@@ -318,6 +322,9 @@ private:
 	std::string applyRemapping(std::string const& _path, std::string const& _context);
 	void resolveImports();
 
+	/// @returns true if the source is requested to be compiled.
+	bool isRequestedSource(std::string const& _sourceName) const;
+
 	/// @returns true if the contract is requested to be compiled.
 	bool isRequestedContract(ContractDefinition const& _contract) const;
 
@@ -387,7 +394,7 @@ private:
 	ReadCallback::Callback m_readFile;
 	OptimiserSettings m_optimiserSettings;
 	langutil::EVMVersion m_evmVersion;
-	std::set<std::string> m_requestedContractNames;
+	std::map<std::string, std::set<std::string>> m_requestedContractNames;
 	bool m_generateIR;
 	bool m_generateEWasm;
 	std::map<std::string, h160> m_libraries;

libsolidity/interface/StandardCompiler.cpp

@@ -100,20 +100,19 @@ Json::Value formatErrorWithException(
 	return formatError(_warning, _type, _component, message, formattedMessage, sourceLocation);
 }
 
-set<string> requestedContractNames(Json::Value const& _outputSelection)
+map<string, set<string>> requestedContractNames(Json::Value const& _outputSelection)
 {
-	set<string> names;
+	map<string, set<string>> contracts;
 	for (auto const& sourceName: _outputSelection.getMemberNames())
 	{
+		string key = (sourceName == "*") ? "" : sourceName;
 		for (auto const& contractName: _outputSelection[sourceName].getMemberNames())
 		{
-			/// Consider the "all sources" shortcuts as requesting everything.
-			if (contractName == "*" || contractName == "")
-				return set<string>();
-			names.insert((sourceName == "*" ? "" : sourceName) + ":" + contractName);
+			string value = (contractName == "*") ? "" : contractName;
+			contracts[key].insert(value);
 		}
 	}
-	return names;
+	return contracts;
 }
 
 /// Returns true iff @a _hash (hex with 0x prefix) is the Keccak256 hash of the binary data in @a _content.

test/cmdlineTests.sh

@@ -144,6 +144,11 @@ function test_solc_behaviour()
     then
         sed -i -e 's/{[^{]*Warning: This is a pre-release compiler version[^}]*},\{0,1\}//' "$stdout_path"
         sed -i -e 's/"errors":\[\],\{0,1\}//' "$stdout_path"
+        # Remove explicit bytecode and references to bytecode offsets
+        sed -i.bak -E -e 's/\"object\":\"[a-f0-9]+\"/\"object\":\"bytecode removed\"/g' "$stdout_path"
+        sed -i.bak -E -e 's/\"opcodes\":\"[^"]+\"/\"opcodes\":\"opcodes removed\"/g' "$stdout_path"
+        sed -i.bak -E -e 's/\"sourceMap\":\"[0-9:;-]+\"/\"sourceMap\":\"sourceMap removed\"/g' "$stdout_path"
+        rm "$stdout_path.bak"
     else
         sed -i -e '/^Warning: This is a pre-release compiler version, please do not use it in production./d' "$stderr_path"
         sed -i -e 's/ Consider adding "pragma .*$//' "$stderr_path"

test/cmdlineTests/output_selection_all_A1/input.json

@@ -0,0 +1,21 @@
+{
+ "language": "Solidity",
+ "sources": {
+  "a.sol": {
+   "content": "contract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
+  },
+  "b.sol": {
+   "content": "contract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
+  }
+ },
+ "settings": {
+  "evmVersion": "petersburg",
+  "outputSelection": {
+   "*": {
+    "A1": [
+     "evm.bytecode.object"
+    ]
+   }
+  }
+ }
+}

test/cmdlineTests/output_selection_all_A1/output.json

@@ -0,0 +1 @@
+{"contracts":{"a.sol":{"A1":{"evm":{"bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":"sourceMap removed"}}}},"b.sol":{"A1":{"evm":{"bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":"sourceMap removed"}}}}},"errors":[{"component":"general","formattedMessage":"a.sol:1:1: Warning: Source file does not specify required compiler version!\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }\n^---------------------------------------------------------------------------------------------------------------------------------^\n","message":"Source file does not specify required compiler version!","severity":"warning","sourceLocation":{"end":131,"file":"a.sol","start":0},"type":"Warning"},{"component":"general","formattedMessage":"b.sol:1:1: Warning: Source file does not specify required compiler version!\ncontract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }\n^----------------------------------------------------------------------------------------------------------------------------^\n","message":"Source file does not specify required compiler version!","severity":"warning","sourceLocation":{"end":126,"file":"b.sol","start":0},"type":"Warning"},{"component":"general","formattedMessage":"b.sol:1:15: Warning: Function state mutability can be restricted to pure\ncontract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }\n              ^------------------------------------------^\n","message":"Function state mutability can be restricted to pure","severity":"warning","sourceLocation":{"end":58,"file":"b.sol","start":14},"type":"Warning"}],"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}

test/cmdlineTests/output_selection_all_A2/input.json

@@ -0,0 +1,21 @@
+{
+ "language": "Solidity",
+ "sources": {
+  "a.sol": {
+   "content": "contract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
+  },
+  "b.sol": {
+   "content": "contract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
+  }
+ },
+ "settings": {
+  "evmVersion": "petersburg",
+  "outputSelection": {
+   "*": {
+    "A2": [
+     "evm.bytecode.object"
+    ]
+   }
+  }
+ }
+}

test/cmdlineTests/output_selection_all_A2/output.json

@@ -0,0 +1 @@
+{"contracts":{"a.sol":{"A2":{"evm":{"bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":"sourceMap removed"}}}}},"errors":[{"component":"general","formattedMessage":"a.sol:1:1: Warning: Source file does not specify required compiler version!\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }\n^---------------------------------------------------------------------------------------------------------------------------------^\n","message":"Source file does not specify required compiler version!","severity":"warning","sourceLocation":{"end":131,"file":"a.sol","start":0},"type":"Warning"},{"component":"general","formattedMessage":"b.sol:1:1: Warning: Source file does not specify required compiler version!\ncontract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }\n^----------------------------------------------------------------------------------------------------------------------------^\n","message":"Source file does not specify required compiler version!","severity":"warning","sourceLocation":{"end":126,"file":"b.sol","start":0},"type":"Warning"},{"component":"general","formattedMessage":"b.sol:1:15: Warning: Function state mutability can be restricted to pure\ncontract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }\n              ^------------------------------------------^\n","message":"Function state mutability can be restricted to pure","severity":"warning","sourceLocation":{"end":58,"file":"b.sol","start":14},"type":"Warning"}],"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}

test/cmdlineTests/output_selection_all_blank/input.json

@@ -0,0 +1,21 @@
+{
+ "language": "Solidity",
+ "sources": {
+  "a.sol": {
+   "content": "contract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
+  },
+  "b.sol": {
+   "content": "contract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
+  }
+ },
+ "settings": {
+  "evmVersion": "petersburg",
+  "outputSelection": {
+   "": {
+    "": [
+     "evm.bytecode.object"
+    ]
+   }
+  }
+ }
+}

test/cmdlineTests/output_selection_all_blank/output.json

@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"a.sol:1:1: Warning: Source file does not specify required compiler version!\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }\n^---------------------------------------------------------------------------------------------------------------------------------^\n","message":"Source file does not specify required compiler version!","severity":"warning","sourceLocation":{"end":131,"file":"a.sol","start":0},"type":"Warning"},{"component":"general","formattedMessage":"b.sol:1:1: Warning: Source file does not specify required compiler version!\ncontract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }\n^----------------------------------------------------------------------------------------------------------------------------^\n","message":"Source file does not specify required compiler version!","severity":"warning","sourceLocation":{"end":126,"file":"b.sol","start":0},"type":"Warning"},{"component":"general","formattedMessage":"b.sol:1:15: Warning: Function state mutability can be restricted to pure\ncontract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }\n              ^------------------------------------------^\n","message":"Function state mutability can be restricted to pure","severity":"warning","sourceLocation":{"end":58,"file":"b.sol","start":14},"type":"Warning"}],"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}

test/cmdlineTests/output_selection_all_star/input.json

@@ -0,0 +1,21 @@
+{
+ "language": "Solidity",
+ "sources": {
+  "a.sol": {
+   "content": "contract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
+  },
+  "b.sol": {
+   "content": "contract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
+  }
+ },
+ "settings": {
+  "evmVersion": "petersburg",
+  "outputSelection": {
+   "*": {
+    "*": [
+     "evm.bytecode.object"
+    ]
+   }
+  }
+ }
+}

test/cmdlineTests/output_selection_all_star/output.json

@@ -0,0 +1 @@
+{"contracts":{"a.sol":{"A1":{"evm":{"bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":"sourceMap removed"}}},"A2":{"evm":{"bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":"sourceMap removed"}}}},"b.sol":{"A1":{"evm":{"bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":"sourceMap removed"}}},"B2":{"evm":{"bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":"sourceMap removed"}}}}},"errors":[{"component":"general","formattedMessage":"a.sol:1:1: Warning: Source file does not specify required compiler version!\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }\n^---------------------------------------------------------------------------------------------------------------------------------^\n","message":"Source file does not specify required compiler version!","severity":"warning","sourceLocation":{"end":131,"file":"a.sol","start":0},"type":"Warning"},{"component":"general","formattedMessage":"b.sol:1:1: Warning: Source file does not specify required compiler version!\ncontract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }\n^----------------------------------------------------------------------------------------------------------------------------^\n","message":"Source file does not specify required compiler version!","severity":"warning","sourceLocation":{"end":126,"file":"b.sol","start":0},"type":"Warning"},{"component":"general","formattedMessage":"b.sol:1:15: Warning: Function state mutability can be restricted to pure\ncontract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }\n              ^------------------------------------------^\n","message":"Function state mutability can be restricted to pure","severity":"warning","sourceLocation":{"end":58,"file":"b.sol","start":14},"type":"Warning"}],"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}

test/cmdlineTests/output_selection_single_A1/input.json

@@ -0,0 +1,21 @@
+{
+ "language": "Solidity",
+ "sources": {
+  "a.sol": {
+   "content": "contract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
+  },
+  "b.sol": {
+   "content": "contract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
+  }
+ },
+ "settings": {
+  "evmVersion": "petersburg",
+  "outputSelection": {
+   "a.sol": {
+    "A1": [
+     "evm.bytecode.object"
+    ]
+   }
+  }
+ }
+}

test/cmdlineTests/output_selection_single_A1/output.json

@@ -0,0 +1 @@
+{"contracts":{"a.sol":{"A1":{"evm":{"bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":"sourceMap removed"}}}}},"errors":[{"component":"general","formattedMessage":"a.sol:1:1: Warning: Source file does not specify required compiler version!\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }\n^---------------------------------------------------------------------------------------------------------------------------------^\n","message":"Source file does not specify required compiler version!","severity":"warning","sourceLocation":{"end":131,"file":"a.sol","start":0},"type":"Warning"}],"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}

test/cmdlineTests/output_selection_single_B1/input.json

@@ -0,0 +1,21 @@
+{
+ "language": "Solidity",
+ "sources": {
+  "a.sol": {
+   "content": "contract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
+  },
+  "b.sol": {
+   "content": "contract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
+  }
+ },
+ "settings": {
+  "evmVersion": "petersburg",
+  "outputSelection": {
+   "b.sol": {
+    "B2": [
+     "evm.bytecode.object"
+    ]
+   }
+  }
+ }
+}

test/cmdlineTests/output_selection_single_B1/output.json

@@ -0,0 +1 @@
+{"contracts":{"b.sol":{"B2":{"evm":{"bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":"sourceMap removed"}}}}},"errors":[{"component":"general","formattedMessage":"b.sol:1:1: Warning: Source file does not specify required compiler version!\ncontract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }\n^----------------------------------------------------------------------------------------------------------------------------^\n","message":"Source file does not specify required compiler version!","severity":"warning","sourceLocation":{"end":126,"file":"b.sol","start":0},"type":"Warning"},{"component":"general","formattedMessage":"b.sol:1:15: Warning: Function state mutability can be restricted to pure\ncontract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }\n              ^------------------------------------------^\n","message":"Function state mutability can be restricted to pure","severity":"warning","sourceLocation":{"end":58,"file":"b.sol","start":14},"type":"Warning"}],"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}

test/cmdlineTests/output_selection_single_all/input.json

@@ -0,0 +1,21 @@
+{
+ "language": "Solidity",
+ "sources": {
+  "a.sol": {
+   "content": "contract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }"
+  },
+  "b.sol": {
+   "content": "contract A1 { function b(uint x) public { assert(x > 0); } } contract B2 { function b(uint x) public pure { assert(x > 0); } }"
+  }
+ },
+ "settings": {
+  "evmVersion": "petersburg",
+  "outputSelection": {
+   "a.sol": {
+    "*": [
+     "evm.bytecode.object"
+    ]
+   }
+  }
+ }
+}

test/cmdlineTests/output_selection_single_all/output.json

@@ -0,0 +1 @@
+{"contracts":{"a.sol":{"A1":{"evm":{"bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":"sourceMap removed"}}},"A2":{"evm":{"bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":"sourceMap removed"}}}}},"errors":[{"component":"general","formattedMessage":"a.sol:1:1: Warning: Source file does not specify required compiler version!\ncontract A1 { function a(uint x) public pure { assert(x > 0); } } contract A2 { function a(uint x) public pure { assert(x > 0); } }\n^---------------------------------------------------------------------------------------------------------------------------------^\n","message":"Source file does not specify required compiler version!","severity":"warning","sourceLocation":{"end":131,"file":"a.sol","start":0},"type":"Warning"}],"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}

test/cmdlineTests/standard_yul/output.json

@@ -1 +1 @@
-{"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":17:18   */\n  0x00\n    /* \"A\":11:19   */\n  mload\n    /* \"A\":38:39   */\n  0x00\n    /* \"A\":34:35   */\n  0x00\n    /* \"A\":31:32   */\n  dup3\n    /* \"A\":27:36   */\n  add\n    /* \"A\":20:40   */\n  sstore\n    /* \"A\":0:42   */\n  pop\n","bytecode":{"linkReferences":{},"object":"6000516000600082015550","opcodes":"PUSH1 0x0 MLOAD PUSH1 0x0 PUSH1 0x0 DUP3 ADD SSTORE POP ","sourceMap":""}},"ir":"object \"object\" {\n    code {\n        let x := mload(0)\n        sstore(add(x, 0), 0)\n    }\n}\n","irOptimized":"object \"object\" {\n    code {\n        let x := mload(0)\n        sstore(add(x, 0), 0)\n    }\n}\n"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+{"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":17:18   */\n  0x00\n    /* \"A\":11:19   */\n  mload\n    /* \"A\":38:39   */\n  0x00\n    /* \"A\":34:35   */\n  0x00\n    /* \"A\":31:32   */\n  dup3\n    /* \"A\":27:36   */\n  add\n    /* \"A\":20:40   */\n  sstore\n    /* \"A\":0:42   */\n  pop\n","bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":""}},"ir":"object \"object\" {\n    code {\n        let x := mload(0)\n        sstore(add(x, 0), 0)\n    }\n}\n","irOptimized":"object \"object\" {\n    code {\n        let x := mload(0)\n        sstore(add(x, 0), 0)\n    }\n}\n"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}

test/cmdlineTests/standard_yul_object/output.json

@@ -1 +1 @@
-{"contracts":{"A":{"NamedObject":{"evm":{"assembly":"  data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45\n    /* \"A\":80:81   */\n  0x00\n    /* \"A\":76:77   */\n  0x00\n    /* \"A\":73:74   */\n  dup3\n    /* \"A\":69:78   */\n  add\n    /* \"A\":62:82   */\n  sstore\n    /* \"A\":28:84   */\n  pop\nstop\ndata_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263\n","bytecode":{"linkReferences":{},"object":"600b6000600082015550fe616263","opcodes":"PUSH1 0xB PUSH1 0x0 PUSH1 0x0 DUP3 ADD SSTORE POP INVALID PUSH2 0x6263 ","sourceMap":""}},"ir":"object \"NamedObject\" {\n    code {\n        let x := dataoffset(\"DataName\")\n        sstore(add(x, 0), 0)\n    }\n    data \"DataName\" hex\"616263\"\n}\n","irOptimized":"object \"NamedObject\" {\n    code {\n        let x := dataoffset(\"DataName\")\n        sstore(add(x, 0), 0)\n    }\n    data \"DataName\" hex\"616263\"\n}\n"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+{"contracts":{"A":{"NamedObject":{"evm":{"assembly":"  data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45\n    /* \"A\":80:81   */\n  0x00\n    /* \"A\":76:77   */\n  0x00\n    /* \"A\":73:74   */\n  dup3\n    /* \"A\":69:78   */\n  add\n    /* \"A\":62:82   */\n  sstore\n    /* \"A\":28:84   */\n  pop\nstop\ndata_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263\n","bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":""}},"ir":"object \"NamedObject\" {\n    code {\n        let x := dataoffset(\"DataName\")\n        sstore(add(x, 0), 0)\n    }\n    data \"DataName\" hex\"616263\"\n}\n","irOptimized":"object \"NamedObject\" {\n    code {\n        let x := dataoffset(\"DataName\")\n        sstore(add(x, 0), 0)\n    }\n    data \"DataName\" hex\"616263\"\n}\n"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}

test/cmdlineTests/standard_yul_object_name/output.json

@@ -1 +1 @@
-{"contracts":{"A":{"NamedObject":{"evm":{"assembly":"  data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45\n    /* \"A\":80:81   */\n  0x00\n    /* \"A\":76:77   */\n  0x00\n    /* \"A\":73:74   */\n  dup3\n    /* \"A\":69:78   */\n  add\n    /* \"A\":62:82   */\n  sstore\n    /* \"A\":28:84   */\n  pop\nstop\ndata_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263\n\nsub_0: assembly {\n        /* \"A\":147:148   */\n      0x00\n        /* \"A\":144:145   */\n      0x00\n        /* \"A\":137:149   */\n      revert\n}\n","bytecode":{"linkReferences":{},"object":"600b6000600082015550fe616263","opcodes":"PUSH1 0xB PUSH1 0x0 PUSH1 0x0 DUP3 ADD SSTORE POP INVALID PUSH2 0x6263 ","sourceMap":""}},"ir":"object \"NamedObject\" {\n    code {\n        let x := dataoffset(\"DataName\")\n        sstore(add(x, 0), 0)\n    }\n    data \"DataName\" hex\"616263\"\n    object \"OtherObject\" {\n        code { revert(0, 0) }\n    }\n}\n","irOptimized":"object \"NamedObject\" {\n    code {\n        let x := dataoffset(\"DataName\")\n        sstore(add(x, 0), 0)\n    }\n    data \"DataName\" hex\"616263\"\n    object \"OtherObject\" {\n        code { revert(0, 0) }\n    }\n}\n"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+{"contracts":{"A":{"NamedObject":{"evm":{"assembly":"  data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45\n    /* \"A\":80:81   */\n  0x00\n    /* \"A\":76:77   */\n  0x00\n    /* \"A\":73:74   */\n  dup3\n    /* \"A\":69:78   */\n  add\n    /* \"A\":62:82   */\n  sstore\n    /* \"A\":28:84   */\n  pop\nstop\ndata_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263\n\nsub_0: assembly {\n        /* \"A\":147:148   */\n      0x00\n        /* \"A\":144:145   */\n      0x00\n        /* \"A\":137:149   */\n      revert\n}\n","bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":""}},"ir":"object \"NamedObject\" {\n    code {\n        let x := dataoffset(\"DataName\")\n        sstore(add(x, 0), 0)\n    }\n    data \"DataName\" hex\"616263\"\n    object \"OtherObject\" {\n        code { revert(0, 0) }\n    }\n}\n","irOptimized":"object \"NamedObject\" {\n    code {\n        let x := dataoffset(\"DataName\")\n        sstore(add(x, 0), 0)\n    }\n    data \"DataName\" hex\"616263\"\n    object \"OtherObject\" {\n        code { revert(0, 0) }\n    }\n}\n"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}

test/cmdlineTests/standard_yul_optimized/output.json

@@ -1 +1 @@
-{"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":17:18   */\n  0x00\n  0x00\n    /* \"A\":11:19   */\n  mload\n    /* \"A\":20:40   */\n  sstore\n","bytecode":{"linkReferences":{},"object":"600060005155","opcodes":"PUSH1 0x0 PUSH1 0x0 MLOAD SSTORE ","sourceMap":""}},"ir":"object \"object\" {\n    code {\n        let x := mload(0)\n        sstore(add(x, 0), 0)\n    }\n}\n","irOptimized":"object \"object\" {\n    code { { sstore(mload(0), 0) } }\n}\n"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+{"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":17:18   */\n  0x00\n  0x00\n    /* \"A\":11:19   */\n  mload\n    /* \"A\":20:40   */\n  sstore\n","bytecode":{"linkReferences":{},"object":"bytecode removed","opcodes":"opcodes removed","sourceMap":""}},"ir":"object \"object\" {\n    code {\n        let x := mload(0)\n        sstore(add(x, 0), 0)\n    }\n}\n","irOptimized":"object \"object\" {\n    code { { sstore(mload(0), 0) } }\n}\n"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}