maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Revert "Keep the old function order in CodeGenModule::applyReplacements." 

This reverts commit r194357.

Debugging a cast failure during bootstrap.

llvm-svn: 194358
This commit is contained in:
Rafael Espindola 2013-11-11 00:37:22 +00:00
parent 732c99c4ae
commit 8d693a3429
2 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clang/lib/CodeGen/CodeGenModule.cpp
View File

@ -181,20 +181,8 @@ void CodeGenModule::applyReplacements() {
llvm::GlobalValue *Entry = GetGlobalValue(MangledName);
if (!Entry)
continue;
llvm::Function *OldF = cast<llvm::Function>(Entry);
llvm::Function *NewF = dyn_cast<llvm::Function>(Replacement);
if (!NewF) {
llvm::ConstantExpr *CE = cast<llvm::ConstantExpr>(Replacement);
assert(CE->getOpcode() == llvm::Instruction::BitCast ||
CE->getOpcode() == llvm::Instruction::GetElementPtr);
NewF = cast<llvm::Function>(CE->getOperand(0));
}
// Replace old with new, but keep the old order.
OldF->replaceAllUsesWith(Replacement);
NewF->removeFromParent();
OldF->getParent()->getFunctionList().insertAfter(OldF, NewF);
OldF->eraseFromParent();
Entry->replaceAllUsesWith(Replacement);
Entry->eraseFromParent();
}
}

16
clang/test/CodeGenCXX/destructors.cpp
View File

@ -36,13 +36,13 @@ namespace PR7526 {
struct allocator_derived : allocator { };
// CHECK-LABEL: define void @_ZN6PR75263fooEv()
// CHECK: call void {{.*}} @_ZN6PR75269allocatorD2Ev
// CHECK-LABEL: define void @_ZN6PR75269allocatorD2Ev(%"struct.PR7526::allocator"* %this) unnamed_addr
// CHECK: call void @__cxa_call_unexpected
allocator::~allocator() throw() { foo(); }
// CHECK-LABEL: define void @_ZN6PR75263fooEv()
// CHECK: call void {{.*}} @_ZN6PR75269allocatorD2Ev
void foo() {
allocator_derived ad;
}
@ -393,16 +393,16 @@ namespace test10 {
// CHECK: call void @_ZN5test312_GLOBAL__N_11DD0Ev(
// CHECK: ret void
// CHECK-LABEL: define internal void @_ZThn8_N5test312_GLOBAL__N_11CD1Ev(
// CHECK: getelementptr inbounds i8* {{.*}}, i64 -8
// CHECK: call void @_ZN5test312_GLOBAL__N_11CD2Ev(
// CHECK: ret void
// CHECK-LABEL: define internal void @_ZN5test312_GLOBAL__N_11CD2Ev(%"struct.test3::<anonymous namespace>::C"* %this) unnamed_addr
// CHECK: invoke void @_ZN5test31BD2Ev(
// CHECK: call void @_ZN5test31AD2Ev(
// CHECK: ret void
// CHECK-LABEL: define internal void @_ZThn8_N5test312_GLOBAL__N_11CD1Ev(
// CHECK: getelementptr inbounds i8* {{.*}}, i64 -8
// CHECK: call void @_ZN5test312_GLOBAL__N_11CD2Ev(
// CHECK: ret void
// CHECK: declare void @_ZN5test31BD2Ev(
// CHECK: declare void @_ZN5test31AD2Ev(