From 1e9b8d38881c3213d1e67b0c47ab9b2c00721a5c Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Fri, 25 Dec 2015 14:26:58 +0000
Subject: Import clang 3.7.1 release (r255217).

---
 lib/CodeGen/CodeGenModule.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lib/CodeGen/CodeGenModule.cpp')

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index a179ad4..c9c48c7 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -2493,6 +2493,11 @@ void CodeGenModule::EmitAliasDefinition(GlobalDecl GD) {
 
   StringRef MangledName = getMangledName(GD);
 
+  if (AA->getAliasee() == MangledName) {
+    Diags.Report(AA->getLocation(), diag::err_cyclic_alias);
+    return;
+  }
+
   // If there is a definition in the module, then it wins over the alias.
   // This is dubious, but allow it to be safe.  Just ignore the alias.
   llvm::GlobalValue *Entry = GetGlobalValue(MangledName);
-- 
cgit v1.1