From ee076a27ce42685c10f237b853d63d4cbbc42e63 Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Tue, 13 May 2014 18:45:53 +0000
Subject: Update for llvm API change.

llvm-svn: 208717
---
 clang/lib/CodeGen/CodeGenModule.cpp | 9 ++++-----
 clang/lib/CodeGen/CodeGenModule.h   | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'clang/lib')

diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index d474c1b464f..2f3f0f02691 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -725,14 +725,13 @@ void CodeGenModule::SetCommonAttributes(const Decl *D,
 }
 
 void CodeGenModule::setNonAliasAttributes(const Decl *D,
-                                          llvm::GlobalValue *GV) {
-  assert(!isa<llvm::GlobalAlias>(GV));
-  SetCommonAttributes(D, GV);
+                                          llvm::GlobalObject *GO) {
+  SetCommonAttributes(D, GO);
 
   if (const SectionAttr *SA = D->getAttr<SectionAttr>())
-    GV->setSection(SA->getName());
+    GO->setSection(SA->getName());
 
-  getTargetCodeGenInfo().SetTargetAttributes(D, GV, *this);
+  getTargetCodeGenInfo().SetTargetAttributes(D, GO, *this);
 }
 
 void CodeGenModule::SetInternalFunctionAttributes(const Decl *D,
diff --git a/clang/lib/CodeGen/CodeGenModule.h b/clang/lib/CodeGen/CodeGenModule.h
index 92a92c64ed7..cdab553ca6c 100644
--- a/clang/lib/CodeGen/CodeGenModule.h
+++ b/clang/lib/CodeGen/CodeGenModule.h
@@ -1020,7 +1020,7 @@ private:
   /// NOTE: This should only be called for definitions.
   void SetCommonAttributes(const Decl *D, llvm::GlobalValue *GV);
 
-  void setNonAliasAttributes(const Decl *D, llvm::GlobalValue *GV);
+  void setNonAliasAttributes(const Decl *D, llvm::GlobalObject *GO);
 
   /// Set attributes for a global definition.
   void setFunctionDefinitionAttributes(const FunctionDecl *D,
-- 
cgit v1.2.3