Merge pull request #8468 from ethereum/develop

Merge develop into release for 0.6.4

.circleci/README.md

@@ -11,7 +11,7 @@ docker build -t ethereum/solidity-buildpack-deps:ubuntu1904-<revision> -f Docker
 docker push ethereum/solidity-buildpack-deps:ubuntu1904-<revision>
 ```
 
-The current revision is stored in a [circle ci pipeline parameter](https://github.com/CircleCI-Public/api-preview-docs/blob/master/docs/pipeline-parameters.md#pipeline-parameters) called `docker-image-rev`. Please update the value assigned to this parameter at the time of a docker image update. Please verify that the value assigned to the parameter matches the revision part of the docker image tag (`<revision>` in the docker build/push snippet shown above). Otherwise, the docker image used by circle ci and the one actually pushed to docker hub will differ.
+The current revisions per docker image are stored in [circle ci pipeline parameters](https://github.com/CircleCI-Public/api-preview-docs/blob/master/docs/pipeline-parameters.md#pipeline-parameters) called `<image-desc>-docker-image-rev` (e.g., `ubuntu-1904-docker-image-rev`). Please update the value assigned to the parameter(s) corresponding to the docker image(s) being updated at the time of the update. Please verify that the value assigned to the parameter matches the revision part of the docker image tag (`<revision>` in the docker build/push snippet shown above). Otherwise, the docker image used by circle ci and the one actually pushed to docker hub will differ.
 
 Once the docker image has been built and pushed to Dockerhub, you can find it at:
 

.circleci/config.yml

@@ -7,9 +7,18 @@
 #     - ems: Emscripten
 version: 2.1
 parameters:
-  docker-image-rev:
+  ubuntu-1804-docker-image-rev:
     type: string
     default: "4"
+  ubuntu-1904-docker-image-rev:
+    type: string
+    default: "4"
+  ubuntu-1904-clang-docker-image-rev:
+    type: string
+    default: "5"
+  ubuntu-1604-clang-ossfuzz-docker-image-rev:
+    type: string
+    default: "2"
 
 defaults:
 
@@ -113,9 +122,20 @@ defaults:
       name: command line tests
       command: ./test/cmdlineTests.sh
 
+  - test_ubuntu1604_clang: &test_ubuntu1604_clang
+      docker:
+        - image: ethereum/solidity-buildpack-deps:ubuntu1604-clang-ossfuzz-<< pipeline.parameters.ubuntu-1604-clang-ossfuzz-docker-image-rev >>
+      steps:
+        - checkout
+        - attach_workspace:
+            at: build
+        - run: *run_soltest
+        - store_test_results: *store_test_results
+        - store_artifacts: *artifacts_test_results
+
   - test_ubuntu1904_clang: &test_ubuntu1904_clang
       docker:
-        - image: ethereum/solidity-buildpack-deps:ubuntu1904-clang-<< pipeline.parameters.docker-image-rev >>
+        - image: ethereum/solidity-buildpack-deps:ubuntu1904-clang-<< pipeline.parameters.ubuntu-1904-clang-docker-image-rev >>
       steps:
         - checkout
         - attach_workspace:
@@ -126,7 +146,7 @@ defaults:
 
   - test_ubuntu1904: &test_ubuntu1904
       docker:
-        - image: ethereum/solidity-buildpack-deps:ubuntu1904-<< pipeline.parameters.docker-image-rev >>
+        - image: ethereum/solidity-buildpack-deps:ubuntu1904-<< pipeline.parameters.ubuntu-1904-docker-image-rev >>
       steps:
         - checkout
         - attach_workspace:
@@ -160,6 +180,11 @@ defaults:
       requires:
         - b_ubu
 
+  - workflow_ubuntu1604_clang: &workflow_ubuntu1604_clang
+      <<: *workflow_trigger_on_tags
+      requires:
+        - b_ubu_ossfuzz
+
   - workflow_ubuntu1904_clang: &workflow_ubuntu1904_clang
       <<: *workflow_trigger_on_tags
       requires:
@@ -190,7 +215,7 @@ defaults:
       requires:
         - b_ems
 
-  - workflow_ubuntu1904_ossfuzz: &workflow_ubuntu1904_ossfuzz
+  - workflow_ubuntu1604_ossfuzz: &workflow_ubuntu1604_ossfuzz
       <<: *workflow_trigger_on_tags
       requires:
         - b_ubu_ossfuzz
@@ -312,7 +337,7 @@ jobs:
 
   b_ubu_clang: &build_ubuntu1904_clang
     docker:
-      - image: ethereum/solidity-buildpack-deps:ubuntu1904-clang-<< pipeline.parameters.docker-image-rev >>
+      - image: ethereum/solidity-buildpack-deps:ubuntu1904-clang-<< pipeline.parameters.ubuntu-1904-clang-docker-image-rev >>
     environment:
       CC: clang
       CXX: clang++
@@ -324,7 +349,7 @@ jobs:
 
   b_ubu: &build_ubuntu1904
     docker:
-      - image: ethereum/solidity-buildpack-deps:ubuntu1904-<< pipeline.parameters.docker-image-rev >>
+      - image: ethereum/solidity-buildpack-deps:ubuntu1904-<< pipeline.parameters.ubuntu-1904-docker-image-rev >>
     steps:
       - checkout
       - run: *run_build
@@ -339,7 +364,7 @@ jobs:
 
   b_ubu18: &build_ubuntu1804
     docker:
-      - image: ethereum/solidity-buildpack-deps:ubuntu1804-<< pipeline.parameters.docker-image-rev >>
+      - image: ethereum/solidity-buildpack-deps:ubuntu1804-<< pipeline.parameters.ubuntu-1804-docker-image-rev >>
     environment:
       CMAKE_OPTIONS: -DCMAKE_CXX_FLAGS=-O2
       CMAKE_BUILD_TYPE: RelWithDebugInfo
@@ -391,12 +416,13 @@ jobs:
       - checkout
       - run: *run_build
 
-  b_ubu_ossfuzz:
-    <<: *build_ubuntu1904_clang
+  b_ubu_ossfuzz: &build_ubuntu1604_clang
+    docker:
+      - image: ethereum/solidity-buildpack-deps:ubuntu1604-clang-ossfuzz-<< pipeline.parameters.ubuntu-1604-clang-ossfuzz-docker-image-rev >>
     environment:
-      TERM: xterm
       CC: clang
       CXX: clang++
+      TERM: xterm
       CMAKE_OPTIONS: -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/libfuzzer.cmake
     steps:
       - checkout
@@ -405,7 +431,7 @@ jobs:
       - persist_to_workspace: *artifacts_executables_ossfuzz
 
   t_ubu_ossfuzz: &t_ubu_ossfuzz
-    <<: *test_ubuntu1904_clang
+    <<: *test_ubuntu1604_clang
     steps:
       - checkout
       - attach_workspace:
@@ -546,7 +572,7 @@ jobs:
 
   b_docs:
     docker:
-      - image: ethereum/solidity-buildpack-deps:ubuntu1904-<< pipeline.parameters.docker-image-rev >>
+      - image: ethereum/solidity-buildpack-deps:ubuntu1904-<< pipeline.parameters.ubuntu-1904-docker-image-rev >>
     steps:
       - checkout
       - run: *setup_prerelease_commit_hash
@@ -571,7 +597,7 @@ jobs:
 
   t_ubu_cli: &t_ubu_cli
     docker:
-      - image: ethereum/solidity-buildpack-deps:ubuntu1904-<< pipeline.parameters.docker-image-rev >>
+      - image: ethereum/solidity-buildpack-deps:ubuntu1904-<< pipeline.parameters.ubuntu-1904-docker-image-rev >>
     environment:
       TERM: xterm
     steps:
@@ -793,7 +819,7 @@ workflows:
     jobs:
       # OSSFUZZ builds and (regression) tests
       - b_ubu_ossfuzz: *workflow_trigger_on_tags
-      - t_ubu_ossfuzz: *workflow_ubuntu1904_ossfuzz
+      - t_ubu_ossfuzz: *workflow_ubuntu1604_ossfuzz
 
       # Code Coverage enabled build and tests
       - b_ubu_codecov: *workflow_trigger_on_tags

.circleci/docker/Dockerfile.ubuntu1604.clang.ossfuzz

@@ -0,0 +1,101 @@
+# vim:syntax=dockerfile
+#------------------------------------------------------------------------------
+# Dockerfile for building and testing Solidity Compiler on CI
+# Target: Ubuntu 16.04 (Xenial Xerus) ossfuzz Clang variant
+# URL: https://hub.docker.com/r/ethereum/solidity-buildpack-deps
+#
+# This file is part of solidity.
+#
+# solidity is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# solidity is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with solidity.  If not, see <http://www.gnu.org/licenses/>
+#
+# (c) 2016-2019 solidity contributors.
+#------------------------------------------------------------------------------
+FROM gcr.io/oss-fuzz-base/base-clang as base
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update; \
+	apt-get -qqy install --no-install-recommends \
+		build-essential \
+		software-properties-common \
+		ninja-build git wget \
+		libbz2-dev zlib1g-dev git curl; \
+    apt-get install -qy python-pip python-sphinx;
+
+# Install cmake 3.14 (minimum requirement is cmake 3.10)
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.14.5/cmake-3.14.5-Linux-x86_64.sh; \
+    chmod +x cmake-3.14.5-Linux-x86_64.sh; \
+    ./cmake-3.14.5-Linux-x86_64.sh --skip-license --prefix="/usr"
+
+FROM base AS libraries
+
+# Boost
+RUN git clone -b boost-1.69.0 https://github.com/boostorg/boost.git \
+    /usr/src/boost; \
+    cd /usr/src/boost; \
+    git submodule update --init --recursive; \
+    ./bootstrap.sh --with-toolset=clang --prefix=/usr; \
+    ./b2 toolset=clang cxxflags="-stdlib=libc++" linkflags="-stdlib=libc++" headers; \
+    ./b2 toolset=clang cxxflags="-stdlib=libc++" linkflags="-stdlib=libc++" \
+        link=static variant=release runtime-link=static \
+        system filesystem unit_test_framework program_options \
+        install -j $(($(nproc)/2)); \
+    rm -rf /usr/src/boost
+
+# Z3
+RUN git clone --depth 1 -b z3-4.8.7 https://github.com/Z3Prover/z3.git \
+    /usr/src/z3; \
+    cd /usr/src/z3; \
+    mkdir build; \
+    cd build; \
+    LDFLAGS=$CXXFLAGS cmake -DZ3_BUILD_LIBZ3_SHARED=OFF -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release ..; \
+    make libz3 -j; \
+    make install; \
+    rm -rf /usr/src/z3
+
+# OSSFUZZ: libprotobuf-mutator
+RUN set -ex; \
+	git clone https://github.com/google/libprotobuf-mutator.git \
+	    /usr/src/libprotobuf-mutator; \
+	cd /usr/src/libprotobuf-mutator; \
+	git checkout 3521f47a2828da9ace403e4ecc4aece1a84feb36; \
+	mkdir build; \
+	cd build; \
+	cmake .. -GNinja -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON \
+        -DLIB_PROTO_MUTATOR_TESTING=OFF -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX="/usr"; \
+	ninja; \
+	cp -vpr external.protobuf/bin/* /usr/bin/; \
+	cp -vpr external.protobuf/include/* /usr/include/; \
+	cp -vpr external.protobuf/lib/* /usr/lib/; \
+	ninja install/strip; \
+	rm -rf /usr/src/libprotobuf-mutator
+
+# EVMONE
+RUN set -ex; \
+	cd /usr/src; \
+	git clone --branch="v0.4.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
+	cd evmone; \
+	mkdir build; \
+	cd build; \
+	cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \
+	ninja; \
+	ninja install/strip; \
+	rm -rf /usr/src/evmone
+
+FROM base
+COPY --from=libraries /usr/lib /usr/lib
+COPY --from=libraries /usr/bin /usr/bin
+COPY --from=libraries /usr/include /usr/include

.circleci/docker/Dockerfile.clang.ubuntu1904 → .circleci/docker/Dockerfile.ubuntu1904.clang

@@ -51,9 +51,10 @@ ENV CC clang
 ENV CXX clang++
 
 # Boost
-RUN git clone --recursive -b boost-1.69.0 https://github.com/boostorg/boost.git \
+RUN git clone -b boost-1.69.0 https://github.com/boostorg/boost.git \
     /usr/src/boost; \
     cd /usr/src/boost; \
+    git submodule update --init --recursive; \
     ./bootstrap.sh --with-toolset=clang --prefix=/usr; \
     ./b2 toolset=clang headers; \
     ./b2 toolset=clang variant=release \
@@ -76,7 +77,7 @@ RUN set -ex; \
 	git clone https://github.com/google/libprotobuf-mutator.git \
 	    /usr/src/libprotobuf-mutator; \
 	cd /usr/src/libprotobuf-mutator; \
-	git checkout d1fe8a7d8ae18f3d454f055eba5213c291986f21; \
+	git checkout 3521f47a2828da9ace403e4ecc4aece1a84feb36; \
 	mkdir build; \
 	cd build; \
 	cmake .. -GNinja -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON \

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.6.3")
+set(PROJECT_VERSION "0.6.4")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
 
 include(TestBigEndian)

Changelog.md

@@ -1,3 +1,24 @@
+### 0.6.4 (2020-03-10)
+
+Language Features:
+ * General: Deprecated `value(...)` and `gas(...)` in favor of `{value: ...}` and `{gas: ...}`
+ * Inline Assembly: Allow assigning to `_slot` of local storage variable pointers.
+ * Inline Assembly: Perform control flow analysis on inline assembly. Allows storage returns to be set in assembly only.
+
+
+Compiler Features:
+ * AssemblyStack: Support for source locations (source mappings) and thus debugging Yul sources.
+ * Commandline Interface: Enable output of experimental optimized IR via ``--ir-optimized``.
+
+
+Bugfixes:
+ * Inheritance: Fix incorrect error on calling unimplemented base functions.
+ * Reference Resolver: Fix scoping issue following try/catch statements.
+ * Standard-JSON-Interface: Fix a bug related to empty filenames and imports.
+ * SMTChecker: Fix internal errors when analysing tuples.
+ * Yul AST Import: correctly import blocks as statements, switch statements and string literals.
+
+
 ### 0.6.3 (2020-02-18)
 
 Language Features:
@@ -6,7 +27,6 @@ Language Features:
  * Report source locations for structured documentation errors.
 
 
-
 Compiler Features:
  * AST: Add a new node for doxygen-style, structured documentation that can be received by contract, function, event and modifier definitions.
  * Code Generator: Use ``calldatacopy`` instead of ``codecopy`` to zero out memory past input.
@@ -20,7 +40,6 @@ Bugfixes:
  * Type Checker: Make invalid calls to uncallable types fatal errors instead of regular.
 
 
-
 ### 0.6.2 (2020-01-27)
 
 Language Features:

appveyor.yml

@@ -64,7 +64,7 @@ build_script:
     - msbuild solidity.sln /p:Configuration=%CONFIGURATION% /m:%NUMBER_OF_PROCESSORS% /v:minimal
     - cd %APPVEYOR_BUILD_FOLDER%
     - scripts\release.bat %CONFIGURATION% 2017
-    - ps: $bytecodedir = git show -s --format="%cd-%H" --date=short
+    - ps: $bytecodedir = git show -s --format="%cd-%H" --date="format:%Y-%m-%d-%H-%M"
 
 test_script:
     - cd %APPVEYOR_BUILD_FOLDER%\build\test\%CONFIGURATION%

cmake/toolchains/libfuzzer.cmake

@@ -8,4 +8,8 @@ set(OSSFUZZ ON CACHE BOOL "Enable fuzzer build" FORCE)
 # Use libfuzzer as the fuzzing back-end
 set(LIB_FUZZING_ENGINE "-fsanitize=fuzzer" CACHE STRING "Use libfuzzer back-end" FORCE)
 # clang/libfuzzer specific flags for UBSan instrumentation
-set(CMAKE_CXX_FLAGS "-O1 -gline-tables-only -fsanitize=undefined -fsanitize=fuzzer-no-link -stdlib=libstdc++" CACHE STRING "Custom compilation flags" FORCE)
+set(CMAKE_CXX_FLAGS "-O1 -fno-omit-frame-pointer -gline-tables-only -DFUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION -I /usr/local/include/c++/v1 -fsanitize=undefined -fsanitize=fuzzer-no-link -stdlib=libc++" CACHE STRING "Custom compilation flags" FORCE)
+# Link statically against boost libraries
+set(BOOST_FOUND ON CACHE BOOL "" FORCE)
+set(Boost_USE_STATIC_LIBS ON CACHE BOOL "Link against static Boost libraries" FORCE)
+set(Boost_USE_STATIC_RUNTIME ON CACHE BOOL "Link against static Boost runtime library" FORCE)

docs/assembly.rst

@@ -11,7 +11,7 @@ You can interleave Solidity statements with inline assembly in a language close
 to the one of the Ethereum virtual machine. This gives you more fine-grained control,
 which is especially useful when you are enhancing the language by writing libraries.
 
-The language used for inline assembly in Solidity is called `Yul <yul>`_
+The language used for inline assembly in Solidity is called :ref:`Yul <yul>`
 and it is documented in its own section. This section will only cover
 how the inline assembly code can interface with the surrounding Solidity code.
 
@@ -24,7 +24,7 @@ how the inline assembly code can interface with the surrounding Solidity code.
 
 
 An inline assembly block is marked by ``assembly { ... }``, where the code inside
-the curly braces is code in the `Yul <yul>`_ language.
+the curly braces is code in the :ref:`Yul <yul>` language.
 
 The inline assembly code can access local Solidity variables as explained below.
 
@@ -172,6 +172,11 @@ Assignments are possible to assembly-local variables and to function-local
 variables. Take care that when you assign to variables that point to
 memory or storage, you will only change the pointer and not the data.
 
+You can assign to the ``_slot`` part of a local storage variable pointer.
+For these (structs, arrays or mappings), the ``_offset`` part is always zero.
+It is not possible to assign to the ``_slot`` or ``_offset`` part of a state variable,
+though.
+
 
 
 Things to Avoid
@@ -225,4 +230,3 @@ first slot of the array and followed by the array elements.
     Statically-sized memory arrays do not have a length field, but it might be added later
     to allow better convertibility between statically- and dynamically-sized arrays, so
     do not rely on this.
-

docs/bugs_by_version.json

@@ -888,5 +888,9 @@
     "0.6.3": {
         "bugs": [],
         "released": "2020-02-18"
+    },
+    "0.6.4": {
+        "bugs": [],
+        "released": "2020-03-10"
     }
 }