about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorVadim Chugunov <vadimcn@gmail.com>2014-08-01 02:23:05 -0700
committerVadim Chugunov <vadimcn@gmail.com>2014-08-04 17:43:56 -0700
commita12b23521fd5cc826a787a45cfa6630857a8939e (patch)
treed21c2e7496af5acc14cbfb671cb2fbc2fcc94b57 /src
parent081991e7e1d4181a22687331b0f504765370835d (diff)
downloadrust-a12b23521fd5cc826a787a45cfa6630857a8939e.tar.gz
rust-a12b23521fd5cc826a787a45cfa6630857a8939e.zip
Update LLVM
Diffstat (limited to 'src')
m---------src/llvm0
-rw-r--r--src/rustllvm/RustWrapper.cpp4
-rw-r--r--src/rustllvm/llvm-auto-clean-trigger2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/llvm b/src/llvm
-Subproject 0d999e5b315b6ff78fcea772466d985ce53fd8d
+Subproject 90a314162053a0c51a50a1c603c9203bef241e0
diff --git a/src/rustllvm/RustWrapper.cpp b/src/rustllvm/RustWrapper.cpp
index 8a3e06aabc6..8051235da20 100644
--- a/src/rustllvm/RustWrapper.cpp
+++ b/src/rustllvm/RustWrapper.cpp
@@ -282,7 +282,7 @@ extern "C" LLVMValueRef LLVMDIBuilderCreateSubroutineType(
     LLVMValueRef ParameterTypes) {
     return wrap(Builder->createSubroutineType(
         unwrapDI<DIFile>(File),
-        unwrapDI<DIArray>(ParameterTypes)));
+        unwrapDI<DITypeArray>(ParameterTypes)));
 }
 
 extern "C" LLVMValueRef LLVMDIBuilderCreateFunction(
@@ -634,7 +634,7 @@ extern "C" void LLVMDICompositeTypeSetTypeArray(
     LLVMValueRef CompositeType,
     LLVMValueRef TypeArray)
 {
-    unwrapDI<DICompositeType>(CompositeType).setTypeArray(unwrapDI<DIArray>(TypeArray));
+    unwrapDI<DICompositeType>(CompositeType).setArrays(unwrapDI<DIArray>(TypeArray));
 }
 
 extern "C" char *LLVMTypeToString(LLVMTypeRef Type) {
diff --git a/src/rustllvm/llvm-auto-clean-trigger b/src/rustllvm/llvm-auto-clean-trigger
index afba5a4dfd8..bf488ca1527 100644
--- a/src/rustllvm/llvm-auto-clean-trigger
+++ b/src/rustllvm/llvm-auto-clean-trigger
@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
 # The actual contents of this file do not matter, but to trigger a change on the
 # build bots then the contents should be changed so git updates the mtime.
-2014-07-29
+2014-08-24