Merge pull request #6853 from ethereum/develop

Merge develop inte release for 0.5.9

Author: chriseth

.circleci/config.yml

@@ -30,7 +30,9 @@ defaults:
       command: scripts/tests.sh --junit_report test_results
   - run_regressions: &run_regressions
       name: Regression tests
-      command: scripts/regressions.py -o test_results
+      command: |
+        export ASAN_OPTIONS="check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2"
+        scripts/regressions.py -o test_results
   - solc_artifact: &solc_artifact
       path: build/solc/solc
       destination: solc
@@ -43,12 +45,14 @@ defaults:
   - ossfuzz_artifacts: &ossfuzz_artifacts
       root: build
       paths:
-        - test/tools/ossfuzz/solc_opt_ossfuzz
-        - test/tools/ossfuzz/solc_noopt_ossfuzz
         - test/tools/ossfuzz/const_opt_ossfuzz
+        - test/tools/ossfuzz/solc_noopt_ossfuzz
+        - test/tools/ossfuzz/solc_opt_ossfuzz
+        - test/tools/ossfuzz/strictasm_assembly_ossfuzz
         - test/tools/ossfuzz/strictasm_diff_ossfuzz
-        - test/tools/ossfuzz/yul_proto_ossfuzz
+        - test/tools/ossfuzz/strictasm_opt_ossfuzz
         - test/tools/ossfuzz/yul_proto_diff_ossfuzz
+        - test/tools/ossfuzz/yul_proto_ossfuzz
 
 version: 2
 jobs:
@@ -134,6 +138,24 @@ jobs:
           command: |
             test/externalTests/zeppelin.sh /tmp/workspace/soljson.js || test/externalTests/zeppelin.sh /tmp/workspace/soljson.js
 
+  test_emscripten_external_colony:
+    docker:
+      - image: circleci/node:10
+    environment:
+      TERM: xterm
+    steps:
+      - checkout
+      - attach_workspace:
+          at: /tmp/workspace
+      - run:
+          name: Install test dependencies
+          command: |
+            sudo apt-get -qy install lsof
+      - run:
+          name: External ColonyNetworks tests
+          command: |
+            test/externalTests/colony.sh /tmp/workspace/soljson.js || test/externalTests/colony.sh /tmp/workspace/soljson.js
+
   build_x86_linux:
     docker:
       - image: buildpack-deps:bionic
@@ -337,13 +359,15 @@ jobs:
             ulimit -a
             # Increase stack size because ASan makes stack frames bigger and that breaks our assumptions (in tests).
             ulimit -s 16384
+            export ASAN_OPTIONS="check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2"
             build/test/soltest --logger=JUNIT,test_suite,test_results/result.xml -- --no-ipc --testpath test
       - run:
           name: Run commandline tests with ASAN
           command: |
             ulimit -a
             # Increase stack size because ASan makes stack frames bigger and that breaks our assumptions (in tests).
             ulimit -s 16384
+            export ASAN_OPTIONS="check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2"
             test/cmdlineTests.sh
       - store_test_results:
           path: test_results/
@@ -416,28 +440,30 @@ jobs:
 
   build_x86_linux_ossfuzz:
     docker:
-      - image: buildpack-deps:cosmic
+      - image: buildpack-deps:disco
     environment:
       TERM: xterm
-      CC: /usr/bin/clang-7
-      CXX: /usr/bin/clang++-7
+      CC: /usr/bin/clang-8
+      CXX: /usr/bin/clang++-8
       CMAKE_OPTIONS: -DOSSFUZZ=1 -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/libfuzzer.cmake
     steps:
       - checkout
       - run:
           name: Install build dependencies
           command: |
             apt-get -qq update
-            apt-get -qy install clang-7 cmake libboost-regex-dev libboost-filesystem-dev libboost-test-dev libboost-system-dev libboost-program-options-dev libcvc4-dev libbz2-dev ninja-build zlib1g-dev libjsoncpp-dev=1.7.4-\*
+            apt-get -qy install wget clang-8 cmake libboost-regex-dev libboost-filesystem-dev libboost-test-dev libboost-system-dev libboost-program-options-dev libcvc4-dev libbz2-dev ninja-build zlib1g-dev libjsoncpp-dev=1.7.4-\*
             ./scripts/install_lpm.sh
             ./scripts/install_libfuzzer.sh
+            # Install evmone and dependencies (intx and ethash)
+            ./scripts/install_evmone.sh
       - run: *setup_prerelease_commit_hash
       - run: *run_build_ossfuzz
       - persist_to_workspace: *ossfuzz_artifacts
 
   test_x86_ossfuzz_regression:
     docker:
-      - image: buildpack-deps:cosmic
+      - image: buildpack-deps:disco
     environment:
       TERM: xterm
     steps:
@@ -448,13 +474,11 @@ jobs:
           name: Install dependencies
           command: |
             apt-get -qq update
-            apt-get -qy install libcvc4-dev llvm-7-dev
+            apt-get -qy install libcvc4-dev llvm-8-dev
             ./scripts/download_ossfuzz_corpus.sh
-            update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-7 1
+            update-alternatives --install /usr/bin/llvm-symbolizer llvm-symbolizer /usr/bin/llvm-symbolizer-8 1
       - run: mkdir -p test_results
       - run: *run_regressions
-      - store_test_results:
-          path: test_results/
       - store_artifacts:
           path: test_results/
           destination: test_results/
@@ -471,14 +495,6 @@ workflows:
           <<: *build_on_tags
           requires:
             - build_emscripten
-      - test_emscripten_external_zeppelin:
-          <<: *build_on_tags
-          requires:
-            - build_emscripten
-      - test_emscripten_external_gnosis:
-          <<: *build_on_tags
-          requires:
-            - build_emscripten
       - build_x86_linux: *build_on_tags
       - build_x86_linux_cxx17: *build_on_tags
       - build_x86_clang7_asan: *build_on_tags
@@ -521,8 +537,13 @@ workflows:
           <<: *build_on_tags
           requires:
             - build_emscripten
+      - test_emscripten_external_colony:
+          <<: *build_on_tags
+          requires:
+            - build_emscripten
       - build_x86_linux_ossfuzz: *build_on_tags
       - test_x86_ossfuzz_regression:
           <<: *build_on_tags
           requires:
             - build_x86_linux_ossfuzz
+

.github/ISSUE_TEMPLATE/bug_report.md

@@ -33,8 +33,8 @@ Please provide a *minimal* source code example to trigger the bug you have found
 Please also mention any command line flags that are necessary for triggering the bug.
 Provide as much information as necessary to reproduce the bug.
 
-```
+```solidity
 // Some *minimal* Solidity source code to reproduce the bug.
 // ...
 ```
--->
+-->

CMakeLists.txt

@@ -10,7 +10,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.5.8")
+set(PROJECT_VERSION "0.5.9")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES CXX)
 
 option(LLL "Build LLL" OFF)

Changelog.md

@@ -1,3 +1,38 @@
+### 0.5.9 (2019-05-28)
+
+Language Features:
+ * Inline Assembly: Revert change introduced in 0.5.7: The ``callvalue()`` instruction does not require ``payable`` anymore.
+ * Static Analyzer: Disallow libraries calling themselves externally.
+
+
+Compiler Features:
+ * Assembler: Encode the compiler version in the deployed bytecode.
+ * Code Generator: Fix handling of structs of dynamic size as constructor parameters.
+ * Commandline Interface: Experimental parser error recovery via the ``--error-recovery`` commandline switch.
+ * Inline Assembly: Disallow the combination of ``msize()`` and the Yul optimizer.
+ * Metadata: Add IPFS hashes of source files.
+ * Optimizer: Add rule to simplify SHL/SHR combinations.
+ * Optimizer: Add rules for multiplication and division by left-shifted one.
+ * SMTChecker: Support inherited state variables.
+ * SMTChecker: Support tuples and function calls with multiple return values.
+ * SMTChecker: Support ``delete``.
+ * SMTChecker: Inline external function calls to ``this``.
+ * Yul Optimizer: Simplify single-run ``for`` loops to ``if`` statements.
+ * Yul Optimizer: Optimize representation of numbers.
+ * Yul Optimizer: Do not inline recursive functions.
+ * Yul Optimizer: Do not remove instructions that affect ``msize()`` if ``msize()`` is used.
+
+Bugfixes:
+ * Code Generator: Explicitly turn uninitialized internal function pointers into invalid functions when loaded from storage.
+ * Code Generator: Fix assertion failure when assigning structs containing array of mapping.
+ * Compiler Internals: Reset the Yul string repository before each compilation, freeing up memory.
+ * SMTChecker: Fix bad cast in base constructor modifier.
+ * SMTChecker: Fix internal error when visiting state variable inherited from base class.
+ * SMTChecker: Fix internal error in fixed point operations.
+ * SMTChecker: Fix internal error in assignment to unsupported type.
+ * SMTChecker: Fix internal error in branching when inlining function calls that modify local variables.
+
+
 ### 0.5.8 (2019-04-30)
 
 Important Bugfixes:
@@ -33,6 +68,7 @@ Bugfixes:
  * SMTChecker: SSA control-flow did not take into account state variables that were modified inside inlined functions that were called inside branches.
  * Type System: Use correct type name for contracts in event parameters when used in libraries. This affected code generation.
  * Type System: Allow direct call to base class functions that have overloads.
+ * Type System: Warn about shadowing builtin variables if user variables are named ``this`` or ``super``.
  * Yul: Properly register functions and disallow shadowing between function variables and variables in the outside scope.
 
 

cmake/EthBuildInfo.cmake

@@ -37,6 +37,9 @@ function(create_build_info NAME)
 		-DETH_BUILD_COMPILER="${ETH_BUILD_COMPILER}"
 		-DETH_BUILD_PLATFORM="${ETH_BUILD_PLATFORM}"
 		-DPROJECT_VERSION="${PROJECT_VERSION}"
+		-DPROJECT_VERSION_MAJOR="${PROJECT_VERSION_MAJOR}"
+		-DPROJECT_VERSION_MINOR="${PROJECT_VERSION_MINOR}"
+		-DPROJECT_VERSION_PATCH="${PROJECT_VERSION_PATCH}"
 		-P "${ETH_SCRIPTS_DIR}/buildinfo.cmake"
 		)
 	include_directories("${PROJECT_BINARY_DIR}/include")

cmake/EthCompilerSettings.cmake

@@ -144,7 +144,13 @@ else ()
 endif ()
 
 if (SANITIZE)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=${SANITIZE}")
+	# Perform case-insensitive string compare
+	string(TOLOWER "${SANITIZE}" san)
+	# -fno-omit-frame-pointer gives more informative stack trace in case of an error
+	# -fsanitize-address-use-after-scope throws an error when a variable is used beyond its scope
+	if (san STREQUAL "address")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-omit-frame-pointer -fsanitize=address -fsanitize-address-use-after-scope")
+	endif()
 endif()
 
 # Code coverage support.

cmake/templates/BuildInfo.h.in

@@ -1,6 +1,9 @@
 #pragma once
 
 #define ETH_PROJECT_VERSION "@PROJECT_VERSION@"
+#define ETH_PROJECT_VERSION_MAJOR @PROJECT_VERSION_MAJOR@
+#define ETH_PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR@
+#define ETH_PROJECT_VERSION_PATCH @PROJECT_VERSION_PATCH@
 #define SOL_COMMIT_HASH "@SOL_COMMIT_HASH@"
 #define ETH_BUILD_TYPE "@ETH_BUILD_TYPE@"
 #define ETH_BUILD_OS "@ETH_BUILD_OS@"

cmake/templates/license.h.in

@@ -67,7 +67,7 @@ jsoncpp:
   license you like.
 
 scanner/token:
-  The liblangutil/{CharStream,Scanner,Token}.{h,cpp} files are dervied from
+  The liblangutil/{CharStream,Scanner,Token}.{h,cpp} files are derived from
   code originating from the V8 project licensed under the following terms:
 
   Copyright 2006-2012, the V8 project authors. All rights reserved.

docs/abi-spec.rst

@@ -214,10 +214,11 @@ Given the contract:
 
     pragma solidity >=0.4.16 <0.7.0;
 
+
     contract Foo {
-      function bar(bytes3[2] memory) public pure {}
-      function baz(uint32 x, bool y) public pure returns (bool r) { r = x > 32 || y; }
-      function sam(bytes memory, bool, uint[] memory) public pure {}
+        function bar(bytes3[2] memory) public pure {}
+        function baz(uint32 x, bool y) public pure returns (bool r) { r = x > 32 || y; }
+        function sam(bytes memory, bool, uint[] memory) public pure {}
     }
 
 
@@ -485,12 +486,13 @@ For example,
 
     pragma solidity >=0.5.0 <0.7.0;
 
+
     contract Test {
-      constructor() public { b = hex"12345678901234567890123456789012"; }
-      event Event(uint indexed a, bytes32 b);
-      event Event2(uint indexed a, bytes32 b);
-      function foo(uint a) public { emit Event(a, b); }
-      bytes32 b;
+        constructor() public { b = hex"12345678901234567890123456789012"; }
+        event Event(uint indexed a, bytes32 b);
+        event Event2(uint indexed a, bytes32 b);
+        function foo(uint a) public { emit Event(a, b); }
+        bytes32 b;
     }
 
 would result in the JSON:
@@ -533,11 +535,12 @@ As an example, the code
     pragma solidity >=0.4.19 <0.7.0;
     pragma experimental ABIEncoderV2;
 
+
     contract Test {
-      struct S { uint a; uint[] b; T[] c; }
-      struct T { uint x; uint y; }
-      function f(S memory s, T memory t, uint a) public;
-      function g() public returns (S memory s, T memory t, uint a);
+        struct S { uint a; uint[] b; T[] c; }
+        struct T { uint x; uint y; }
+        function f(S memory s, T memory t, uint a) public;
+        function g() public returns (S memory s, T memory t, uint a);
     }
 
 would result in the JSON: