Skip to content

Commit 01ff0d4

Browse files
authored
Merge pull request #2602 from ziglang/copy-elision-3
result location mechanism (part of no-copy semantics)
2 parents 07c0d48 + 517bdea commit 01ff0d4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+4319
-2112
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6734,6 +6734,7 @@ add_custom_command(
67346734
"-Doutput-dir=${CMAKE_BINARY_DIR}"
67356735
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
67366736
DEPENDS
6737+
zig0
67376738
"${CMAKE_SOURCE_DIR}/src-self-hosted/dep_tokenizer.zig"
67386739
"${CMAKE_SOURCE_DIR}/src-self-hosted/stage1.zig"
67396740
"${CMAKE_SOURCE_DIR}/src-self-hosted/translate_c.zig"

build.zig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ pub fn build(b: *Builder) !void {
7474
const skip_non_native = b.option(bool, "skip-non-native", "Main test suite skips non-native builds") orelse false;
7575
const skip_self_hosted = b.option(bool, "skip-self-hosted", "Main test suite skips building self hosted compiler") orelse false;
7676
if (!skip_self_hosted) {
77-
test_step.dependOn(&exe.step);
77+
// TODO re-enable this after https://github.com/ziglang/zig/issues/2377
78+
//test_step.dependOn(&exe.step);
7879
}
7980
const verbose_link_exe = b.option(bool, "verbose-link", "Print link command for self hosted compiler") orelse false;
8081
exe.setVerboseLink(verbose_link_exe);

doc/langref.html.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5096,7 +5096,7 @@ fn gimmeTheBiggerInteger(a: u64, b: u64) u64 {
50965096
<p>
50975097
For example, if we were to introduce another function to the above snippet:
50985098
</p>
5099-
{#code_begin|test_err|values of type 'type' must be comptime known#}
5099+
{#code_begin|test_err|cannot store runtime value in type 'type'#}
51005100
fn max(comptime T: type, a: T, b: T) T {
51015101
return if (a > b) a else b;
51025102
}

0 commit comments

Comments
 (0)