From 4084504caac224362f918a8b74a747dd8c1fdd0f Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Thu, 17 Mar 2016 20:06:58 +0000
Subject: 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
---
 clang/lib/CodeGen/CodeGenAction.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'clang/lib/CodeGen/CodeGenAction.cpp')

diff --git a/clang/lib/CodeGen/CodeGenAction.cpp b/clang/lib/CodeGen/CodeGenAction.cpp
index edd258d3d5e..638f79a2452 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();
-- 
cgit v1.2.3