Merge commit 'a113a582b1a2c04f5df89db50e446074f74559b0' into llvmspirv_pulldown

Author: vmaksimo

bolt/lib/Rewrite/RewriteInstance.cpp

@@ -2350,7 +2350,7 @@ void RewriteInstance::readRelocations(const SectionRef &Section) {
         continue;
     }
 
-    if (BC->getDynamicRelocationAt(Rel.getOffset())) {
+    if (!IsAArch64 && BC->getDynamicRelocationAt(Rel.getOffset())) {
       LLVM_DEBUG(
           dbgs() << "BOLT-DEBUG: address 0x"
                  << Twine::utohexstr(Rel.getOffset())

bolt/test/AArch64/constant-island-alignment.s

@@ -5,7 +5,7 @@
 # RUN: llvm-mc -filetype=obj -triple aarch64-unknown-unknown \
 # RUN:   %s -o %t.o
 # RUN: %clang %cflags -fPIC -pie %t.o -o %t.exe -Wl,-q \
-# RUN:    -nostartfiles -nodefaultlibs -lc
+# RUN:    -nostartfiles -nodefaultlibs -Wl,-z,notext
 # RUN: llvm-bolt %t.exe -o %t.bolt -use-old-text=0 -lite=0 -trap-old-code
 # RUN: llvm-objdump -d --disassemble-symbols='$d' %t.bolt | FileCheck %s
 
@@ -21,16 +21,16 @@ dummy:
 .type exitOk, %function
 exitOk:
   mov x0, #0
-  bl exit
+  ret
 
 .global _start
 .type _start, %function
 _start:
   adrp x0, .Lci
   ldr x0, [x0, #:lo12:.Lci]
   blr x0
-  mov x1, #1
-  bl exit
+  mov x0, #1
+  ret
   nop
 # CHECK: {{0|8}} <$d>:
 .Lci:

bolt/test/AArch64/constant_island_pie_update.s

@@ -0,0 +1,38 @@
+// This test checks that the constant island value is updated if it
+// has dynamic relocation.
+
+# RUN: llvm-mc -filetype=obj -triple aarch64-unknown-unknown \
+# RUN:   %s -o %t.o
+# RUN: %clang %cflags -fPIC -pie %t.o -o %t.exe -Wl,-q -nostdlib -Wl,-z,notext
+# RUN: llvm-bolt %t.exe -o %t.bolt -use-old-text=0 -lite=0
+# RUN: llvm-objdump -j .text -dR %t.bolt | FileCheck %s
+
+# CHECK: R_AARCH64_RELATIVE *ABS*+0x[[#%x,ADDR:]]
+# CHECK: [[#ADDR]] <exitLocal>:
+# CHECK: {{.*}} <$d>:
+# CHECK-NEXT: {{.*}} .word 0x{{[0]+}}[[#ADDR]]
+# CHECK-NEXT: {{.*}} .word 0x00000000
+
+  .text
+  .align 4
+  .local exitLocal
+  .type exitLocal, %function
+exitLocal:
+  add x1, x1, #1
+  add x1, x1, #1
+  ret
+  .size exitLocal, .-exitLocal
+
+  .global _start
+  .type _start, %function
+_start:
+  mov x0, #0
+  adr x1, .Lci
+  ldr x1, [x1]
+  blr x1
+  mov x0, #1
+  bl exitLocal
+  nop
+.Lci:
+  .xword exitLocal
+  .size _start, .-_start

bolt/test/AArch64/double_jump.cpp

@@ -52,4 +52,4 @@ unsigned long foo(unsigned long count) {
   return count;
 }
 
-int main(int argc, const char *argv[]) { return foo(38); }
+extern "C" int _start() { return foo(38); }

bolt/test/AArch64/lit.local.cfg

@@ -1,2 +1,7 @@
 if config.host_arch not in ['aarch64']:
     config.unsupported = True
+
+config.substitutions.insert(
+    0, ('%cflags',
+        '%cflags --target=aarch64-pc-linux -nostartfiles -nostdlib -fuse-ld=lld'
+        ' -Wl,--unresolved-symbols=ignore-all'))

bolt/test/AArch64/tailcall_traps.s

@@ -17,12 +17,12 @@
 
   .text
   .align 4
-  .global main
-  .type main, %function
-main:
+  .global _start
+  .type _start, %function
+_start:
   nop
   ret
-  .size main, .-main
+  .size _start, .-_start
 
   .global foo
   .type foo, %function

clang-tools-extra/clang-tidy/modernize/CMakeLists.txt

@@ -11,6 +11,7 @@ add_clang_library(clangTidyModernizeModule
   DeprecatedIosBaseAliasesCheck.cpp
   LoopConvertCheck.cpp
   LoopConvertUtils.cpp
+  MacroToEnumCheck.cpp
   MakeSharedCheck.cpp
   MakeSmartPtrCheck.cpp
   MakeUniqueCheck.cpp