diff options
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 4 | ||||
| -rw-r--r-- | clang/test/CodeGenCXX/constructor-alias.cpp | 12 |
2 files changed, 15 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 402b309f8ec..173774452e9 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -656,7 +656,9 @@ void CodeGenModule::SetCommonAttributes(const Decl *D, if (const SectionAttr *SA = D->getAttr<SectionAttr>()) GV->setSection(SA->getName()); - getTargetCodeGenInfo().SetTargetAttributes(D, GV, *this); + // Alias cannot have attributes. Filter them here. + if (!isa<llvm::GlobalAlias>(GV)) + getTargetCodeGenInfo().SetTargetAttributes(D, GV, *this); } void CodeGenModule::SetInternalFunctionAttributes(const Decl *D, diff --git a/clang/test/CodeGenCXX/constructor-alias.cpp b/clang/test/CodeGenCXX/constructor-alias.cpp new file mode 100644 index 00000000000..18a47775012 --- /dev/null +++ b/clang/test/CodeGenCXX/constructor-alias.cpp @@ -0,0 +1,12 @@ +// RUN: %clang_cc1 -emit-llvm -triple mipsel--linux-gnu -mconstructor-aliases -o - %s | FileCheck %s + +// The target attribute code used to get confused with aliases. Make sure +// we don't crash when an alias is used. + +struct B { + B(); +}; +B::B() { +} + +// CHECK: @_ZN1BC1Ev = alias void (%struct.B*)* @_ZN1BC2Ev |
