forked from lukebuehler/azimuth-cli
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patches taken from upstream: ethereum/solidity#4772 ethereum/solidity#5223 ethereum/solidity#5226 It also requires a change to the arguments for the unit tests, since boost changed how the options are parsed. Update oldNixpkgs to the latest working version. This revision has a `flake.nix` file so it no longer needs the input config to specify `flake = false;`. It also prints a warning about deprecated `stdenv.lib`.
- Loading branch information
1 parent
8bdcee8
commit 2b12f77
Showing
4 changed files
with
76 additions
and
8 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
commit d3c3fd20796dd18b7213938bd0ce89e8aeb9d6f3 | ||
Author: Alex Beregszaszi <[email protected]> | ||
Date: Wed Aug 8 20:46:28 2018 +0100 | ||
|
||
Use dev::toString() in Assembly instead of misusing string{} for u256 | ||
|
||
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp | ||
index b71bc80cb..28ae95777 100644 | ||
--- a/libevmasm/Assembly.cpp | ||
+++ b/libevmasm/Assembly.cpp | ||
@@ -264,7 +264,7 @@ Json::Value Assembly::assemblyJSON(StringMap const& _sourceCodes) const | ||
createJsonValue("PUSH [ErrorTag]", i.location().start, i.location().end, "")); | ||
else | ||
collection.append( | ||
- createJsonValue("PUSH [tag]", i.location().start, i.location().end, string(i.data()))); | ||
+ createJsonValue("PUSH [tag]", i.location().start, i.location().end, dev::toString(i.data()))); | ||
break; | ||
case PushSub: | ||
collection.append( | ||
@@ -290,7 +290,7 @@ Json::Value Assembly::assemblyJSON(StringMap const& _sourceCodes) const | ||
break; | ||
case Tag: | ||
collection.append( | ||
- createJsonValue("tag", i.location().start, i.location().end, string(i.data()))); | ||
+ createJsonValue("tag", i.location().start, i.location().end, dev::toString(i.data()))); | ||
collection.append( | ||
createJsonValue("JUMPDEST", i.location().start, i.location().end)); | ||
break; | ||
|
||
commit 55d91d5f9cdc176c771b6038948d5dacba383e34 | ||
Author: Bhargava Shastry <[email protected]> | ||
Date: Mon Oct 15 17:14:22 2018 +0200 | ||
|
||
Bug fix: Add missing include in test/Options.h; otherwise compiler does not recognise the boost object that Options subclasses | ||
|
||
diff --git a/test/Options.h b/test/Options.h | ||
index 9bc698762..cbaa0dd1a 100644 | ||
--- a/test/Options.h | ||
+++ b/test/Options.h | ||
@@ -24,7 +24,7 @@ | ||
#include <boost/test/unit_test.hpp> | ||
#include <boost/filesystem.hpp> | ||
#include <boost/version.hpp> | ||
- | ||
+#include <boost/core/noncopyable.hpp> | ||
#include <functional> | ||
|
||
namespace dev | ||
|
||
commit 3d4e5f30e1696bee8482058b5ec4adb51f9f1387 | ||
Author: chriseth <[email protected]> | ||
Date: Mon Oct 15 18:08:41 2018 +0200 | ||
|
||
Correct include path | ||
|
||
diff --git a/test/Options.h b/test/Options.h | ||
index cbaa0dd1a..0e8a51dad 100644 | ||
--- a/test/Options.h | ||
+++ b/test/Options.h | ||
@@ -24,7 +24,8 @@ | ||
#include <boost/test/unit_test.hpp> | ||
#include <boost/filesystem.hpp> | ||
#include <boost/version.hpp> | ||
-#include <boost/core/noncopyable.hpp> | ||
+#include <boost/noncopyable.hpp> | ||
+ | ||
#include <functional> | ||
|
||
namespace dev |