From 0c337ed63ff0f04fd8315afabb2d7a51969fdc97 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 12 May 2009 21:02:27 +0000 Subject: [PATCH] add an initial stab at emitting deferred c++ inline functions. This handles static functions and methods declared inline, but not ctors/dtors or methods not declared inline (apparently my previous patch wasn't good enough). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@71591 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/CodeGenModule.cpp | 9 +++++++++ test/CodeGenCXX/member-functions.cpp | 28 ++++++++++++++++++++++++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp index c2dc629680..6e4a67b917 100644 --- a/lib/CodeGen/CodeGenModule.cpp +++ b/lib/CodeGen/CodeGenModule.cpp @@ -606,6 +606,15 @@ llvm::Constant *CodeGenModule::GetOrCreateLLVMFunction(const char *MangledName, // list, and remove it from DeferredDecls (since we don't need it anymore). DeferredDeclsToEmit.push_back(DDI->second); DeferredDecls.erase(DDI); + } else if (D && D->isThisDeclarationADefinition() && MayDeferGeneration(D)) { + // If this the first reference to a C++ inline function in a class, queue up + // the deferred function body for emission. These are not seen as + // top-level declarations. + // FIXME: Make this work for ctor/dtors. We need to pass down a full + // GlobalDecl instead of just a FunctionDecl. + if (!isa(D) && + !isa(D)) + DeferredDeclsToEmit.push_back(GlobalDecl(D)); } // This function doesn't have a complete type (for example, the return diff --git a/test/CodeGenCXX/member-functions.cpp b/test/CodeGenCXX/member-functions.cpp index 9cdab0a662..83278909ea 100644 --- a/test/CodeGenCXX/member-functions.cpp +++ b/test/CodeGenCXX/member-functions.cpp @@ -8,12 +8,36 @@ struct C { void C::f() { } -void f() { +void test1() { C c; // RUN: grep "call void @_ZN1C1fEv" %t | count 1 && c.f(); -// RUN: grep "call void (.struct.C\*, i32, ...)\* @_ZN1C1gEiz" %t | count 1 +// RUN: grep "call void (.struct.C\*, i32, ...)\* @_ZN1C1gEiz" %t | count 1 && c.g(1, 2, 3); } + + +struct S { + S() { } + ~S() { } + + + void f_inline1() { } + // RUN: grep "define linkonce_odr void @_ZN1S9f_inline2Ev" %t && + inline void f_inline2() { } + + // RUN: grep "define internal void @_ZN1S1gEv" %t + static void g() { } +}; + +void test2() { + S s; + + s.f_inline1(); + s.f_inline2(); + + S::g(); + +} -- 2.40.0