Merge pull request JuliaLang#16674 from JuliaLang/yyc/tests/llvm

Fix compilation on LLVM39
vtjnash · May 31, 2016 · d07b849 · d07b849
2 parents 0919d71 + caa8c8d
commit d07b849
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/ccall.cpp b/src/ccall.cpp
@@ -555,10 +555,12 @@ class FunctionMover : public ValueMaterializer
         return NewF;
     }
 
-#ifdef LLVM38
-    virtual Value *materializeDeclFor(Value *V)
+#if defined(LLVM39)
+    virtual Value *materialize(Value *V) override
+#elif defined(LLVM38)
+    virtual Value *materializeDeclFor(Value *V) override
 #else
-    virtual Value *materializeValueFor (Value *V)
+    virtual Value *materializeValueFor (Value *V) override
 #endif
     {
         Function *F = dyn_cast<Function>(V);