Merge remote-tracking branch 'origin/llvm12'

Happy LLVM 12 Release Day.

Please note that the llvm 12 tag does not include the latest commit in
the release/12.x branch, which is in fact a bug fix for a regression
that is causing a failure in Zig's test suite.

Zig master branch is tracking release/12.x, and will be enabling the
test that is fixed by that commit.

1 files changed, 2 insertions, 5 deletions

diff --git a/src/Compilation.zig b/src/Compilation.zig
index f76f13cc77..485d7690f5 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -2345,6 +2345,7 @@ pub fn addCCArgs(
         }
         try argv.append("-D_LIBCPP_DISABLE_VISIBILITY_ANNOTATIONS");
         try argv.append("-D_LIBCXXABI_DISABLE_VISIBILITY_ANNOTATIONS");
+        try argv.append("-D_LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS");
     }
 
     const llvm_triple = try @import("codegen/llvm.zig").targetTriple(arena, target);
@@ -2927,11 +2928,7 @@ pub fn generateBuiltinZigSource(comp: *Compilation, allocator: *Allocator) ![]u8
         const index = @intCast(std.Target.Cpu.Feature.Set.Index, index_usize);
         const is_enabled = target.cpu.features.isEnabled(index);
         if (is_enabled) {
-            // TODO some kind of "zig identifier escape" function rather than
-            // unconditionally using @"" syntax
-            try buffer.appendSlice("        .@\"");
-            try buffer.appendSlice(feature.name);
-            try buffer.appendSlice("\",\n");
+            try buffer.writer().print("        .{},\n", .{std.zig.fmtId(feature.name)});
         }
     }