2 files changed, 17 insertions, 0 deletions
diff --git a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
index dae0ea89420..ae96c7f5955 100644
--- a/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
+++ b/llvm/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -903,6 +903,9 @@ GenericValue ExecutionEngine::getConstantValue(const Constant *C) {
     Result.IntVal = cast<ConstantInt>(C)->getValue();
     break;
   case Type::PointerTyID:
+    while (auto *A = dyn_cast<GlobalAlias>(C)) {
+      C = A->getAliasee();
+    }
     if (isa<ConstantPointerNull>(C))
       Result.PointerVal = nullptr;
     else if (const Function *F = dyn_cast<Function>(C))
diff --git a/llvm/test/ExecutionEngine/Interpreter/alias.ll b/llvm/test/ExecutionEngine/Interpreter/alias.ll
new file mode 100644
index 00000000000..4bfdd2ce060
--- /dev/null
+++ b/llvm/test/ExecutionEngine/Interpreter/alias.ll
@@ -0,0 +1,14 @@
+; RUN: %lli -force-interpreter %s
+
+define i32 @func() {
+entry:
+  ret i32 0
+}
+
+@alias = alias i32 (), i32 ()* @func
+
+define i32 @main() {
+entry:
+  %call = call i32 @alias()
+  ret i32 %call
+}