[llvm] r198701 - Don't assert with private type info variables.
Rafael Espindola
rafael.espindola at gmail.com
Tue Jan 7 11:38:47 PST 2014
Author: rafael
Date: Tue Jan 7 13:38:47 2014
New Revision: 198701
URL: http://llvm.org/viewvc/llvm-project?rev=198701&view=rev
Log:
Don't assert with private type info variables.
With the gnu objc runtime private strings are used. Since we only need to
produce a unique label, the fix is to just drop the asserts.
Added:
llvm/trunk/test/CodeGen/X86/catch.ll
Modified:
llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp
Modified: llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp?rev=198701&r1=198700&r2=198701&view=diff
==============================================================================
--- llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp (original)
+++ llvm/trunk/lib/Target/TargetLoweringObjectFile.cpp Tue Jan 7 13:38:47 2014
@@ -111,9 +111,6 @@ MCSymbol *TargetLoweringObjectFile::getS
MCSymbol *TargetLoweringObjectFile::getSymbolWithGlobalValueBase(
Mangler &M, const GlobalValue *GV, StringRef Suffix) const {
assert(!Suffix.empty());
- assert(!GV->hasPrivateLinkage());
- assert(!GV->hasLinkerPrivateLinkage());
- assert(!GV->hasLinkerPrivateWeakLinkage());
SmallString<60> NameStr;
NameStr += DL->getPrivateGlobalPrefix();
Added: llvm/trunk/test/CodeGen/X86/catch.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/catch.ll?rev=198701&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/X86/catch.ll (added)
+++ llvm/trunk/test/CodeGen/X86/catch.ll Tue Jan 7 13:38:47 2014
@@ -0,0 +1,21 @@
+; RUN: llc < %s -mtriple=x86_64-pc-linux -relocation-model=pic | FileCheck %s
+
+; PR18390
+; We used to assert creating this label. The name itself is not critical. It
+; just needs to be a unique local symbol.
+; CHECK: .L.Lstr.DW.stub:
+; CHECK-NEXT: .quad .Lstr
+
+ at str = private unnamed_addr constant [12 x i8] c"NSException\00"
+define void @f() {
+ invoke void @g()
+ to label %invoke.cont unwind label %lpad
+invoke.cont:
+ ret void
+lpad:
+ %tmp14 = landingpad { i8*, i32 } personality i8* bitcast (void ()* @h to i8*)
+ catch i8* getelementptr inbounds ([12 x i8]* @str, i64 0, i64 0)
+ ret void
+}
+declare void @g()
+declare void @h()
More information about the llvm-commits
mailing list