Merge pull request #2602 from ziglang/copy-elision-3

result location mechanism (part of no-copy semantics)
ziglang · Jun 26, 2019 · 01ff0d4 · 01ff0d4
2 parents 07c0d48 + 517bdea
commit 01ff0d4
Show file tree

Hide file tree

Showing 42 changed files with 4,319 additions and 2,112 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6734,6 +6734,7 @@ add_custom_command(
         "-Doutput-dir=${CMAKE_BINARY_DIR}"
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
     DEPENDS
+        zig0
         "${CMAKE_SOURCE_DIR}/src-self-hosted/dep_tokenizer.zig"
         "${CMAKE_SOURCE_DIR}/src-self-hosted/stage1.zig"
         "${CMAKE_SOURCE_DIR}/src-self-hosted/translate_c.zig"

diff --git a/build.zig b/build.zig
@@ -74,7 +74,8 @@ pub fn build(b: *Builder) !void {
     const skip_non_native = b.option(bool, "skip-non-native", "Main test suite skips non-native builds") orelse false;
     const skip_self_hosted = b.option(bool, "skip-self-hosted", "Main test suite skips building self hosted compiler") orelse false;
     if (!skip_self_hosted) {
-        test_step.dependOn(&exe.step);
+        // TODO re-enable this after https://github.com/ziglang/zig/issues/2377
+        //test_step.dependOn(&exe.step);
     }
     const verbose_link_exe = b.option(bool, "verbose-link", "Print link command for self hosted compiler") orelse false;
     exe.setVerboseLink(verbose_link_exe);

diff --git a/doc/langref.html.in b/doc/langref.html.in
@@ -5096,7 +5096,7 @@ fn gimmeTheBiggerInteger(a: u64, b: u64) u64 {
       <p>
       For example, if we were to introduce another function to the above snippet:
       </p>
-      {#code_begin|test_err|values of type 'type' must be comptime known#}
+      {#code_begin|test_err|cannot store runtime value in type 'type'#}
 fn max(comptime T: type, a: T, b: T) T {
     return if (a > b) a else b;
 }