diff options
author | Owen Anderson <resistor@mac.com> | 2010-08-06 18:33:48 +0000 |
---|---|---|
committer | Owen Anderson <resistor@mac.com> | 2010-08-06 18:33:48 +0000 |
commit | a7aed18624f7783b7c31b06069c43bec89f1813f (patch) | |
tree | 12c29122999e559e3d99f19d576e0245874372f3 /llvm/lib/CodeGen/MachineModuleInfo.cpp | |
parent | e68958fcdfb02296df153598c1610cefd915d51e (diff) | |
download | bcm5719-llvm-a7aed18624f7783b7c31b06069c43bec89f1813f.tar.gz bcm5719-llvm-a7aed18624f7783b7c31b06069c43bec89f1813f.zip |
Reapply r110396, with fixes to appease the Linux buildbot gods.
llvm-svn: 110460
Diffstat (limited to 'llvm/lib/CodeGen/MachineModuleInfo.cpp')
-rw-r--r-- | llvm/lib/CodeGen/MachineModuleInfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/MachineModuleInfo.cpp b/llvm/lib/CodeGen/MachineModuleInfo.cpp index d2e3bf74641..b647a4dcc53 100644 --- a/llvm/lib/CodeGen/MachineModuleInfo.cpp +++ b/llvm/lib/CodeGen/MachineModuleInfo.cpp @@ -254,7 +254,7 @@ void MMIAddrLabelMapCallbackPtr::allUsesReplacedWith(Value *V2) { //===----------------------------------------------------------------------===// MachineModuleInfo::MachineModuleInfo(const MCAsmInfo &MAI) -: ImmutablePass(&ID), Context(MAI), +: ImmutablePass(ID), Context(MAI), ObjFileMMI(0), CurCallSite(0), CallsEHReturn(0), CallsUnwindInit(0), DbgInfoAvailable(false){ // Always emit some info, by default "no personality" info. @@ -264,7 +264,7 @@ MachineModuleInfo::MachineModuleInfo(const MCAsmInfo &MAI) } MachineModuleInfo::MachineModuleInfo() -: ImmutablePass(&ID), Context(*(MCAsmInfo*)0) { +: ImmutablePass(ID), Context(*(MCAsmInfo*)0) { assert(0 && "This MachineModuleInfo constructor should never be called, MMI " "should always be explicitly constructed by LLVMTargetMachine"); abort(); |