aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/CodeGen/CodeGenAction.cpp
diff options
context:
space:
mode:
authorReid Kleckner <rnk@google.com>2016-03-17 20:06:58 +0000
committerReid Kleckner <rnk@google.com>2016-03-17 20:06:58 +0000
commit4084504caac224362f918a8b74a747dd8c1fdd0f (patch)
tree7bb752f4097adc7e1fa4e5f46e69705b54c827a6 /clang/lib/CodeGen/CodeGenAction.cpp
parentc5575aabd62d2dc6ad74d03d0b49cc40dcb19b1e (diff)
downloadllvm-4084504caac224362f918a8b74a747dd8c1fdd0f.zip
llvm-4084504caac224362f918a8b74a747dd8c1fdd0f.tar.gz
llvm-4084504caac224362f918a8b74a747dd8c1fdd0f.tar.bz2
Revert "For MS ABI, emit dllexport friend functions defined inline in class"
This reverts commit r263738. This appears to cause a failure in CXX/temp/temp.decls/temp.friend/p1.cpp llvm-svn: 263740
Diffstat (limited to 'clang/lib/CodeGen/CodeGenAction.cpp')
-rw-r--r--clang/lib/CodeGen/CodeGenAction.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/clang/lib/CodeGen/CodeGenAction.cpp b/clang/lib/CodeGen/CodeGenAction.cpp
index edd258d3..638f79a 100644
--- a/clang/lib/CodeGen/CodeGenAction.cpp
+++ b/clang/lib/CodeGen/CodeGenAction.cpp
@@ -123,14 +123,14 @@ namespace clang {
return true;
}
- void HandleInlineFunctionDefinition(FunctionDecl *D) override {
+ void HandleInlineMethodDefinition(CXXMethodDecl *D) override {
PrettyStackTraceDecl CrashInfo(D, SourceLocation(),
Context->getSourceManager(),
- "LLVM IR generation of inline function");
+ "LLVM IR generation of inline method");
if (llvm::TimePassesIsEnabled)
LLVMIRGeneration.startTimer();
- Gen->HandleInlineFunctionDefinition(D);
+ Gen->HandleInlineMethodDefinition(D);
if (llvm::TimePassesIsEnabled)
LLVMIRGeneration.stopTimer();