diff --git a/lib/Linker/IRMover.cpp b/lib/Linker/IRMover.cpp
index 9489f965546..e67a5b42dc4 100644
--- a/lib/Linker/IRMover.cpp
+++ b/lib/Linker/IRMover.cpp
@@ -610,15 +610,16 @@ Value *IRLinker::materialize(Value *V, bool ForIndirectSymbol) {
       return New;
   }
 
-  // When linking a global for an indirect symbol, it will always be linked.
-  // However we need to check if it was not already scheduled to satisfy a
-  // reference from a regular global value initializer. We know if it has been
-  // schedule if the "New" GlobalValue that is mapped here for the indirect
-  // symbol is the same as the one already mapped. If there is an entry in the
+  // If the global is being linked for an indirect symbol, it may have already
+  // been scheduled to satisfy a regular symbol. Similarly, a global being linked
+  // for a regular symbol may have already been scheduled for an indirect
+  // symbol. Check for these cases by looking in the other value map and
+  // confirming the same value has been scheduled.  If there is an entry in the
   // ValueMap but the value is different, it means that the value already had a
   // definition in the destination module (linkonce for instance), but we need a
-  // new definition for the indirect symbol ("New" will be different.
-  if (ForIndirectSymbol && ValueMap.lookup(SGV) == New)
+  // new definition for the indirect symbol ("New" will be different).
+  if ((ForIndirectSymbol && ValueMap.lookup(SGV) == New) ||
+      (!ForIndirectSymbol && IndirectSymbolValueMap.lookup(SGV) == New))
     return New;
 
   if (ForIndirectSymbol || shouldLink(New, *SGV))
diff --git a/test/Linker/alias-4.ll b/test/Linker/alias-4.ll
new file mode 100644
index 00000000000..06de4b28362
--- /dev/null
+++ b/test/Linker/alias-4.ll
@@ -0,0 +1,12 @@
+; RUN: llvm-link %s -S -o - | FileCheck %s
+target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-apple-macosx10.9"
+
+; CHECK-DAG: @gv0 = constant i64* @alias
+; CHECK-DAG: @gv1 = constant i64 ptrtoint (i64* @gv1 to i64)
+; CHECK-DAG: @alias = alias i64, i64* @gv1
+
+@gv0 = constant i64* @alias
+@gv1 = constant i64 ptrtoint (i64* @gv1 to i64)
+
+@alias = alias i64, i64* @gv1