---

vadimcn · vadimcn · commit 5806a56cfab8 · 2014-08-04T17:43:56.000-07:00
yaml --- r: 126414 b: refs/heads/master c: a12b235 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 081991e7e1d4181a22687331b0f504765370835d
+refs/heads/master: a12b23521fd5cc826a787a45cfa6630857a8939e
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
 refs/heads/try: cd2003ffd8dd976342f9e8fc1429ae93d6780e81
diff --git a/trunk/src/llvm b/trunk/src/llvm
@@ -1 +1 @@
-Subproject commit 0d999e5b315b6ff78fcea772466d985ce53fd8dc
+Subproject commit 90a314162053a0c51a50a1c603c9203bef241e0d
diff --git a/trunk/src/rustllvm/RustWrapper.cpp b/trunk/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/trunk/src/rustllvm/llvm-auto-clean-trigger b/trunk/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

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Subproject commit 0d999e5b315b6ff78fcea772466d985ce53fd8dc`
	`1`	`+Subproject commit 90a314162053a0c51a50a1c603c9203bef241e0d`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ extern "C" LLVMValueRef LLVMDIBuilderCreateSubroutineType(`
`282`	`282`	`LLVMValueRef ParameterTypes) {`
`283`	`283`	`return wrap(Builder->createSubroutineType(`
`284`	`284`	`unwrapDI<DIFile>(File),`
`285`		`- unwrapDI<DIArray>(ParameterTypes)));`
	`285`	`+ unwrapDI<DITypeArray>(ParameterTypes)));`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`extern "C" LLVMValueRef LLVMDIBuilderCreateFunction(`
`@@ -634,7 +634,7 @@ extern "C" void LLVMDICompositeTypeSetTypeArray(`
`634`	`634`	`LLVMValueRef CompositeType,`
`635`	`635`	`LLVMValueRef TypeArray)`
`636`	`636`	`{`
`637`		`- unwrapDI<DICompositeType>(CompositeType).setTypeArray(unwrapDI<DIArray>(TypeArray));`
	`637`	`+ unwrapDI<DICompositeType>(CompositeType).setArrays(unwrapDI<DIArray>(TypeArray));`
`638`	`638`	`}`
`639`	`639`
`640`	`640`	`extern "C" char *LLVMTypeToString(LLVMTypeRef Type) {`