Commit f0092f48 authored by Tom Stellard's avatar Tom Stellard
Browse files

Merging r203007: 

------------------------------------------------------------------------
r203007 | rafael.espindola | 2014-03-05 16:04:41 -0500 (Wed, 05 Mar 2014) | 4 lines

Don't produce an alias between destructors with different calling conventions.

Fixes pr19007.

------------------------------------------------------------------------

llvm-svn: 206059
parent 2c2b1619

clang/lib/CodeGen/CGCXX.cpp

+6 −0
Original line number Diff line number Diff line
@@ -92,7 +92,13 @@ bool CodeGenModule::TryEmitBaseDestructorAsAlias(const CXXDestructorDecl *D) { 
  if (!ClassLayout.getBaseClassOffset(UniqueBase).isZero())

    return true;



  // Give up if the calling conventions don't match. We could update the call,

  // but it is probably not worth it.

  const CXXDestructorDecl *BaseD = UniqueBase->getDestructor();

  if (BaseD->getType()->getAs<FunctionType>()->getCallConv() !=

      D->getType()->getAs<FunctionType>()->getCallConv())

    return true;



  return TryEmitDefinitionAsAlias(GlobalDecl(D, Dtor_Base),

                                  GlobalDecl(BaseD, Dtor_Base),

                                  false);

clang/test/CodeGenCXX/ctor-dtor-alias.cpp

+18 −2
Original line number Diff line number Diff line 
// RUN: %clang_cc1 %s -triple x86_64-linux -emit-llvm -o - -mconstructor-aliases -O1 -disable-llvm-optzns | FileCheck %s

// RUN: %clang_cc1 %s -triple x86_64-linux -emit-llvm -o - -mconstructor-aliases | FileCheck --check-prefix=NOOPT %s

// RUN: %clang_cc1 %s -triple i686-linux -emit-llvm -o - -mconstructor-aliases -O1 -disable-llvm-optzns | FileCheck %s

// RUN: %clang_cc1 %s -triple i686-linux -emit-llvm -o - -mconstructor-aliases | FileCheck --check-prefix=NOOPT %s



// RUN: %clang_cc1 -cc1 -triple x86_64--netbsd -emit-llvm \

// RUN: -mconstructor-aliases -O2 %s -o - | FileCheck --check-prefix=CHECK-RAUW %s
@@ -133,6 +133,22 @@ namespace test8 { 
  zed foo;

}



namespace test9 {

struct foo {

  __attribute__((stdcall)) ~foo() {

  }

};



struct bar : public foo {};



void zed() {

  // Test that we produce a call to bar's destructor. We used to call foo's, but

  // it has a different calling conversion.

  // CHECK-DAG: call void @_ZN5test93barD2Ev

  bar ptr;

}

}



// CHECK-RAUW: @_ZTV1C = linkonce_odr unnamed_addr constant [4 x i8*] [{{[^@]*}}@_ZTI1C {{[^@]*}}@_ZN1CD2Ev {{[^@]*}}@_ZN1CD0Ev {{[^@]*}}]

// r194296 replaced C::~C with B::~B without emitting the later.