Skip to content

[rust][RelLookupTableConverter] Remove unnamed_addr on x86_64-apple-darwin #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[rust][RelLookupTableConverter] Remove unnamed_addr on x86_64-apple-darwin #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions llvm/lib/Transforms/Utils/RelLookupTableConverter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include "llvm/IR/IRBuilder.h"
#include "llvm/IR/Instructions.h"
#include "llvm/IR/Module.h"
#include "llvm/TargetParser/Triple.h"

using namespace llvm;

Expand Down Expand Up @@ -108,6 +109,15 @@ static GlobalVariable *createRelLookupTable(Function &Func,
uint64_t Idx = 0;
SmallVector<Constant *, 64> RelLookupTableContents(NumElts);

// Apple's ld-classic assigns incorrect relative addresses on
// x86_64-apple-darwin. See https://github.com/rust-lang/rust/issues/140686.
Triple TT(M.getTargetTriple());
if (TT.isX86() && TT.isOSDarwin())
for (Use &Operand : LookupTableArr->operands()) {
if (auto *GlobalElement = dyn_cast<GlobalValue>(Operand))
GlobalElement->setUnnamedAddr(GlobalValue::UnnamedAddr::None);
}

for (Use &Operand : LookupTableArr->operands()) {
Constant *Element = cast<Constant>(Operand);
Type *IntPtrTy = M.getDataLayout().getIntPtrType(M.getContext());
Expand Down
23 changes: 23 additions & 0 deletions llvm/test/Transforms/RelLookupTableConverter/X86/darwin.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
; RUN: opt < %s -passes=rel-lookup-table-converter -relocation-model=pic -mtriple=x86_64-apple-darwin -S | FileCheck -check-prefix=NO-UNNAMED-ADDR %s
; RUN: opt < %s -passes=rel-lookup-table-converter -relocation-model=pic -mtriple=x86_64 -S | FileCheck -check-prefix=UNNAMED-ADDR %s
; RUN: opt < %s -passes=rel-lookup-table-converter -relocation-model=pic -mtriple=aarch64-apple-darwin -S | FileCheck -check-prefix=UNNAMED-ADDR %s

; NO-UNNAMED-ADDR: @L{{.*}} = private constant
; UNNAMED-ADDR: @L{{.*}} = private unnamed_addr constant

@L1 = private unnamed_addr constant [1 x i8] zeroinitializer, align 1
@L2 = private unnamed_addr constant [8 x i8] c"\01\02\03\04\05\06\07\08", align 1
@L3 = private unnamed_addr constant [1 x i8] c"\09", align 1
@switch.table.broken = private unnamed_addr constant [3 x ptr] [ptr @L1, ptr @L2, ptr @L3], align 8
@switch.table.broken.1 = private unnamed_addr constant [3 x ptr] [ptr getelementptr inbounds ([1 x i8], ptr @L1, i64 1, i64 0), ptr getelementptr inbounds ([8 x i8], ptr @L2, i64 1, i64 0), ptr getelementptr inbounds ([1 x i8], ptr @L3, i64 1, i64 0)], align 8

define i64 @broken(i64 %0) {
%2 = getelementptr inbounds [3 x ptr], ptr @switch.table.broken, i64 0, i64 %0
%3 = load ptr, ptr %2, align 8
%4 = getelementptr inbounds [3 x ptr], ptr @switch.table.broken.1, i64 0, i64 %0
%5 = load ptr, ptr %4, align 8
%6 = tail call i64 @slice_len_from_ptr_end(ptr %3, ptr %5)
ret i64 %6
}

declare i64 @slice_len_from_ptr_end(ptr, ptr)