[llvm] Implement address sanitizer on AIX (2/3)

The PR includes llvm changes needed for the address sanitizer on AIX.

Author: jakeegan

llvm/lib/DebugInfo/Symbolize/SymbolizableObjectFile.cpp

@@ -331,7 +331,7 @@ DIGlobal SymbolizableObjectFile::symbolizeData(
  std::string FileName;
  getNameFromSymbolTable(ModuleOffset.Address, Res.Name, Res.Start, Res.Size,
  FileName);
- Res.DeclFile = FileName;
+ Res.DeclFile = FileName.empty() ? Res.Name : FileName;
 
  // Try and get a better filename:lineno pair from the debuginfo, if present.
  DILineInfo DL = DebugInfoContext->getLineInfoForDataAddress(ModuleOffset);

llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp

@@ -119,6 +119,9 @@ static const uint64_t kNetBSDKasan_ShadowOffset64 = 0xdfff900000000000;
 static const uint64_t kPS_ShadowOffset64 = 1ULL << 40;
 static const uint64_t kWindowsShadowOffset32 = 3ULL << 28;
 static const uint64_t kEmscriptenShadowOffset = 0;
+static const uint64_t kAIXShadowOffset32 = 0x40000000;
+// 64-BIT AIX is not yet ready.
+static const uint64_t kAIXShadowOffset64 = 0x0a01000000000000ULL;
 
 // The shadow memory space is dynamically allocated.
 static const uint64_t kWindowsShadowOffset64 = kDynamicShadowSentinel;
@@ -128,6 +131,8 @@ static const size_t kMaxStackMallocSize = 1 << 16; // 64K
 static const uintptr_t kCurrentStackFrameMagic = 0x41B58AB3;
 static const uintptr_t kRetiredStackFrameMagic = 0x45E0360E;
 
+static const uint32_t kAIXHighBits = 6;
+
 const char kAsanModuleCtorName[] = "asan.module_ctor";
 const char kAsanModuleDtorName[] = "asan.module_dtor";
 static const uint64_t kAsanCtorAndDtorPriority = 1;
@@ -468,6 +473,7 @@ namespace {
 /// shadow = (mem >> Scale) + &__asan_shadow
 struct ShadowMapping {
  int Scale;
+ int HighBits;
  uint64_t Offset;
  bool OrShadowOffset;
  bool InGlobal;
@@ -487,6 +493,7 @@ static ShadowMapping getShadowMapping(const Triple &TargetTriple, int LongSize,
  bool IsLinux = TargetTriple.isOSLinux();
  bool IsPPC64 = TargetTriple.getArch() == Triple::ppc64 ||
  TargetTriple.getArch() == Triple::ppc64le;
+ bool IsAIX = TargetTriple.isOSAIX();
  bool IsSystemZ = TargetTriple.getArch() == Triple::systemz;
  bool IsX86_64 = TargetTriple.getArch() == Triple::x86_64;
  bool IsMIPSN32ABI = TargetTriple.isABIN32();
@@ -526,14 +533,18 @@ static ShadowMapping getShadowMapping(const Triple &TargetTriple, int LongSize,
  Mapping.Offset = kWindowsShadowOffset32;
  else if (IsEmscripten)
  Mapping.Offset = kEmscriptenShadowOffset;
+ else if (IsAIX)
+ Mapping.Offset = kAIXShadowOffset32; 
  else
  Mapping.Offset = kDefaultShadowOffset32;
  } else { // LongSize == 64
  // Fuchsia is always PIE, which means that the beginning of the address
  // space is always available.
  if (IsFuchsia)
  Mapping.Offset = 0;
- else if (IsPPC64)
+ else if (IsAIX)
+ Mapping.Offset = kAIXShadowOffset64;
+ else if (IsPPC64 && !IsAIX)
  Mapping.Offset = kPPC64_ShadowOffset64;
  else if (IsSystemZ)
  Mapping.Offset = kSystemZ_ShadowOffset64;
@@ -592,13 +603,16 @@ static ShadowMapping getShadowMapping(const Triple &TargetTriple, int LongSize,
  // SystemZ, we could OR the constant in a single instruction, but it's more
  // efficient to load it once and use indexed addressing.
  Mapping.OrShadowOffset = !IsAArch64 && !IsPPC64 && !IsSystemZ && !IsPS &&
- !IsRISCV64 && !IsLoongArch64 &&
+ !IsRISCV64 && !IsLoongArch64 && !IsAIX &&
  !(Mapping.Offset & (Mapping.Offset - 1)) &&
  Mapping.Offset != kDynamicShadowSentinel;
  bool IsAndroidWithIfuncSupport =
  IsAndroid && !TargetTriple.isAndroidVersionLT(21);
  Mapping.InGlobal = ClWithIfunc && IsAndroidWithIfuncSupport && IsArmOrThumb;
 
+ if (IsAIX && LongSize == 64)
+ Mapping.HighBits = kAIXHighBits;
+
  return Mapping;
 }
 
@@ -1326,7 +1340,11 @@ static bool isUnsupportedAMDGPUAddrspace(Value *Addr) {
 
 Value *AddressSanitizer::memToShadow(Value *Shadow, IRBuilder<> &IRB) {
  // Shadow >> scale
- Shadow = IRB.CreateLShr(Shadow, Mapping.Scale);
+ if (TargetTriple.isOSAIX() && TargetTriple.getArch() == Triple::ppc64)
+ Shadow = IRB.CreateLShr(IRB.CreateShl(Shadow, Mapping.HighBits),
+ Mapping.Scale + Mapping.HighBits);
+ else
+ Shadow = IRB.CreateLShr(Shadow, Mapping.Scale);
  if (Mapping.Offset == 0) return Shadow;
  // (Shadow >> scale) | offset
  Value *ShadowBase;

llvm/test/DebugInfo/Symbolize/ELF/data-command-symtab.yaml

@@ -7,15 +7,15 @@
 
 # CHECK: func
 # CHECK-NEXT: 4096 1
-# CHECK-NEXT: ??:?
+# CHECK-NEXT: func:0
 # CHECK-EMPTY:
 # CHECK-NEXT: data
 # CHECK-NEXT: 8192 2
-# CHECK-NEXT: ??:?
+# CHECK-NEXT: data:0
 # CHECK-EMPTY:
 # CHECK-NEXT: notype
 # CHECK-NEXT: 8194 3
-# CHECK-NEXT: ??:?
+# CHECK-NEXT: notype:0
 # CHECK-EMPTY:
 
 --- !ELF

llvm/test/DebugInfo/Symbolize/ELF/symtab-file2.yaml

@@ -74,7 +74,7 @@ Symbols:
 
 # CHECK3: code
 # CHECK3-NEXT: 4096 2
-# CHECK3-NEXT: ??:?
+# CHECK3-NEXT: code:0
 # CHECK3-EMPTY:
 
 --- !ELF

llvm/test/tools/llvm-symbolizer/data.s

@@ -7,11 +7,11 @@
 
 # CHECK: d1
 # CHECK-NEXT: 0 8
-# CHECK-NEXT: ??:?
+# CHECK-NEXT: d1:0
 # CHECK-EMPTY:
 # CHECK-NEXT: d2
 # CHECK-NEXT: 8 4
-# CHECK-NEXT: ??:?
+# CHECK-NEXT: d2:0
 # CHECK-EMPTY:
 
 d1:

llvm/tools/llvm-nm/llvm-nm.cpp

@@ -697,6 +697,12 @@ static void printLineNumbers(symbolize::LLVMSymbolizer &Symbolizer,
  return;
  break;
  }
+ case 'a':
+ return;
+ case 'd':
+ return;
+ case 'r':
+ return;
  case 't':
  case 'T': {
  Expected<DILineInfo> ResOrErr = Symbolizer.symbolizeCode(*Obj, Address);