forked from OSchip/llvm-project
Resubmit r256193 with test fix: assertion failure analyzed
llvm-svn: 256201
This commit is contained in:
parent
88dddf9198
commit
ab361efee7
|
@ -279,6 +279,16 @@ static inline bool shouldRecordFunctionAddr(Function *F) {
|
|||
return F->hasAddressTaken();
|
||||
}
|
||||
|
||||
static inline Comdat *getOrCreateProfileComdat(Module &M,
|
||||
InstrProfIncrementInst *Inc) {
|
||||
// COFF format requires a COMDAT section to have a key symbol with the same
|
||||
// name.
|
||||
StringRef ComdatPrefix = (Triple(M.getTargetTriple()).isOSBinFormatCOFF()
|
||||
? getInstrProfDataVarPrefix()
|
||||
: getInstrProfComdatPrefix());
|
||||
return M.getOrInsertComdat(StringRef(getVarName(Inc, ComdatPrefix)));
|
||||
}
|
||||
|
||||
GlobalVariable *
|
||||
InstrProfiling::getOrCreateRegionCounters(InstrProfIncrementInst *Inc) {
|
||||
GlobalVariable *NamePtr = Inc->getName();
|
||||
|
@ -297,8 +307,7 @@ InstrProfiling::getOrCreateRegionCounters(InstrProfIncrementInst *Inc) {
|
|||
Function *Fn = Inc->getParent()->getParent();
|
||||
Comdat *ProfileVarsComdat = nullptr;
|
||||
if (Fn->hasComdat())
|
||||
ProfileVarsComdat = M->getOrInsertComdat(
|
||||
StringRef(getVarName(Inc, getInstrProfComdatPrefix())));
|
||||
ProfileVarsComdat = getOrCreateProfileComdat(*M, Inc);
|
||||
NamePtr->setSection(getNameSection());
|
||||
NamePtr->setAlignment(1);
|
||||
NamePtr->setComdat(ProfileVarsComdat);
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
;; Check that data associated with linkonce odr functions are placed in
|
||||
;; the same comdat section as their associated function.
|
||||
|
||||
|
||||
; RUN: opt < %s -mtriple=x86_64-apple-macosx10.10.0 -instrprof -S | FileCheck %s
|
||||
; RUN: opt < %s -mtriple=x86_64-unknown-linux -instrprof -S | FileCheck %s
|
||||
; RUN: opt < %s -mtriple=x86_64-pc-win64-coff -instrprof -S | FileCheck %s --check-prefix=COFF
|
||||
|
||||
$_Z3barIvEvv = comdat any
|
||||
|
||||
|
@ -12,6 +14,11 @@ $_Z3barIvEvv = comdat any
|
|||
; CHECK: @__profc__Z3barIvEvv = linkonce_odr hidden global [1 x i64] zeroinitializer, section "{{.*}}__llvm_prf_cnts", comdat($__profv__Z3barIvEvv), align 8
|
||||
; CHECK: @__profd__Z3barIvEvv = linkonce_odr hidden global { i32, i32, i64, i8*, i64*, i8*, i8*, [1 x i16] } { i32 11, i32 1, i64 0, i8* getelementptr inbounds ([11 x i8], [11 x i8]* @__profn__Z3barIvEvv, i32 0, i32 0), i64* getelementptr inbounds ([1 x i64], [1 x i64]* @__profc__Z3barIvEvv, i32 0, i32 0), i8* null, i8* null, [1 x i16] zeroinitializer }, section "{{.*}}__llvm_prf_data", comdat($__profv__Z3barIvEvv), align 8
|
||||
|
||||
; COFF: @__profn__Z3barIvEvv = linkonce_odr hidden constant [11 x i8] c"_Z3barIvEvv", section "{{.*}}__llvm_prf_names", comdat($__profd__Z3barIvEvv), align 1
|
||||
; COFF: @__profc__Z3barIvEvv = linkonce_odr hidden global [1 x i64] zeroinitializer, section "{{.*}}__llvm_prf_cnts", comdat($__profd__Z3barIvEvv), align 8
|
||||
; COFF: @__profd__Z3barIvEvv = linkonce_odr hidden global { i32, i32, i64, i8*, i64*, i8*, i8*, [1 x i16] } { i32 11, i32 1, i64 0, i8* getelementptr inbounds ([11 x i8], [11 x i8]* @__profn__Z3barIvEvv, i32 0, i32 0), i64* getelementptr inbounds ([1 x i64], [1 x i64]* @__profc__Z3barIvEvv, i32 0, i32 0), i8* null, i8* null, [1 x i16] zeroinitializer }, section "{{.*}}__llvm_prf_data", comdat, align 8
|
||||
|
||||
|
||||
declare void @llvm.instrprof.increment(i8*, i64, i32, i32) #1
|
||||
|
||||
define linkonce_odr void @_Z3barIvEvv() comdat {
|
||||
|
|
Loading…
Reference in New Issue