add aarch64 test case

Author: Jinjie-Huang

bolt/lib/Core/BinaryFunction.cpp

@@ -1044,8 +1044,10 @@ MCSymbol *BinaryFunction::getOrCreateLocalLabel(uint64_t Address) {
 
   // For AArch64, check if this address is part of a constant island.
   if (BC.isAArch64()) {
-    if (MCSymbol *IslandSym = getOrCreateIslandAccess(Address))
+    if (MCSymbol *IslandSym = getOrCreateIslandAccess(Address)) {
+      Labels[Offset] = IslandSym;
       return IslandSym;
+    }
   }
 
   if (Offset == getSize())
@@ -1925,7 +1927,8 @@ bool BinaryFunction::validateExternalBranch(uint64_t TargetAddress) {
       return true;
 
     if (TargetFunction->CurrentState == State::Disassembled &&
-        !TargetFunction->getInstructionAtOffset(TargetOffset))
+        (!TargetFunction->getInstructionAtOffset(TargetOffset) ||
+         getSizeOfDataInCodeAt(TargetOffset)))
       IsValid = false;
   } else {
     if (!BC.getSectionForAddress(TargetAddress))
@@ -1959,15 +1962,14 @@ bool BinaryFunction::validateInternalBranch() {
     if (!Offset || (Offset > getSize()))
       continue;
 
-    if (getInstructionAtOffset(Offset))
-      continue;
-
-    BC.errs() << "BOLT-WARNING: corrupted control flow detected in function "
-              << *this << ", an internal branch/call targets an invalid "
-              << "instruction at address 0x"
-              << Twine::utohexstr(getAddress() + Offset) << "\n";
-    setIgnored();
-    return false;
+    if (!getInstructionAtOffset(Offset) || getSizeOfDataInCodeAt(Offset)) {
+      BC.errs() << "BOLT-WARNING: corrupted control flow detected in function "
+                << *this << ", an internal branch/call targets an invalid "
+                << "instruction at address 0x"
+                << Twine::utohexstr(getAddress() + Offset) << "\n";
+      setIgnored();
+      return false;
+    }
   }
 
   return true;

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

@@ -53,6 +53,7 @@ _start:
   blr x0
   mov x0, #1
   ret
+.size _start,.-_start
   nop
 # CHECK: {{0|8}} <$d>:
 .Lci:

bolt/test/AArch64/validate-branch-target.s

@@ -0,0 +1,33 @@
+## Test that BOLT errs when detecting the target 
+## of a direct call/branch is a invalid instruction
+
+# REQUIRES: system-linux
+# RUN: rm -rf %t && mkdir -p %t && cd %t
+# RUN: llvm-mc -filetype=obj -triple aarch64-unknown-linux %s -o main.o
+# RUN: %clang %cflags %t/main.o -o main.exe -Wl,-q
+# RUN: llvm-bolt %t/main.exe -o %t/main.exe.bolt -lite=0 2>&1 | FileCheck %s --check-prefix=CHECK-TARGETS
+
+# CHECK-TARGETS: BOLT-WARNING: corrupted control flow detected in function external_corrupt, an external branch/call targets an invalid instruction at address 0x{{[0-9a-f]+}}
+# CHECK-TARGETS: BOLT-WARNING: corrupted control flow detected in function internal_corrupt, an internal branch/call targets an invalid instruction at address 0x{{[0-9a-f]+}}
+
+
+.globl  internal_corrupt
+.type   internal_corrupt,@function
+internal_corrupt:
+    ret
+    nop
+.Lfake_branch_1:
+    .inst 0x14000001  // Opcode 0x14=b, check for internal branch: b + 0x4
+.Lgarbage_1:
+    .word 0xffffffff
+.size   internal_corrupt,.-internal_corrupt
+
+
+.globl  external_corrupt
+.type   external_corrupt,@function
+external_corrupt:
+    ret
+    nop
+.Lfake_branch_2:
+    .inst   0x14000004  // Opcode 0x14=b, check for external branch: b + 0xf
+.size   external_corrupt,.-external_corrupt

bolt/test/X86/validate-branch-target.s

@@ -7,14 +7,14 @@
 # RUN: %clang %cflags -pie -Wl,-q %t/main.o -o main.exe
 # RUN: llvm-bolt %t/main.exe -o %t/main.exe.bolt -lite=0 2>&1 | FileCheck %s --check-prefix=CHECK-TARGETS
 
-# CHECK-TARGETS: BOLT-WARNING: corrupted control flow detected in function external_corrcupt, an external branch/call targets an invalid instruction at address 0x{{[0-9a-f]+}}
-# CHECK-TARGETS: BOLT-WARNING: corrupted control flow detected in function internal_corrcupt, an internal branch/call targets an invalid instruction at address 0x{{[0-9a-f]+}}
+# CHECK-TARGETS: BOLT-WARNING: corrupted control flow detected in function external_corrupt, an external branch/call targets an invalid instruction at address 0x{{[0-9a-f]+}}
+# CHECK-TARGETS: BOLT-WARNING: corrupted control flow detected in function internal_corrupt, an internal branch/call targets an invalid instruction at address 0x{{[0-9a-f]+}}
 
 
-.globl	internal_corrcupt
-.type	internal_corrcupt,@function
+.globl	internal_corrupt
+.type	internal_corrupt,@function
 .align	16
-internal_corrcupt:
+internal_corrupt:
 	leaq	.Lopts_1(%rip),%rax
 	addq	$25,%rax
 	.byte	0xf3,0xc3
@@ -26,13 +26,13 @@ internal_corrcupt:
 .Lopts_1:
 .byte	114,1,52,40,56,120,44,105,110,116,41,0  # data '114' will be disassembled as 'jb', check for internal branch: jb + 0x1
 .align	64
-.size	internal_corrcupt,.-internal_corrcupt
+.size	internal_corrupt,.-internal_corrupt
 
 
-.globl	external_corrcupt
-.type	external_corrcupt,@function
+.globl	external_corrupt
+.type	external_corrupt,@function
 .align	16
-external_corrcupt:
+external_corrupt:
 	leaq	.Lopts_2(%rip),%rax
 	addq	$25,%rax
 	.byte	0xf3,0xc3
@@ -44,4 +44,4 @@ external_corrcupt:
 .Lopts_2:
 .byte	114,99,52,40,56,120,44,99,104,97,114,41,0  # data '114' will be disassembled as 'jb', check for external branch: jb + 0x63
 .align	64
-.size	external_corrcupt,.-external_corrcupt
+.size	external_corrupt,.-external_corrupt