Merge branch 'upstream-pnacl-llvm'

Author: DiamondLovesYou

.gitmodules

@@ -1,7 +1,3 @@
-[submodule "src/llvm"]
-	path = src/llvm
-	url = https://github.com/DiamondLovesYou/llvm.git
-	branch = master
 [submodule "src/compiler-rt"]
 	path = src/compiler-rt
 	url = https://github.com/rust-lang/compiler-rt.git
@@ -19,3 +15,7 @@
 	path = src/nacl-binutils
 	url = https://chromium.googlesource.com/native_client/nacl-binutils.git
         branch = pnacl/2.34/master
+[submodule "src/llvm"]
+	path = src/llvm
+	url = [email protected]:DiamondLovesYou/llvm.git
+        branch = merge_36

src/librust-pnacl-trans/lib.rs

@@ -285,7 +285,7 @@ pub fn main() {
                 llvm::LLVMRustAddLibraryInfo(pm, llmod, false);
 
                 assert!(llvm::LLVMRustAddPass(pm,
-                                              "combine-vector-instructions\0"
+                                              "backend-canonicalize\0"
                                                    .as_ptr() as *const i8));
 
                 let out = format!("{}.o", i);

src/librustc_llvm/lib.rs

@@ -1959,6 +1959,9 @@ extern {
 
     pub fn LLVMDIBuilderCreateOpPlus() -> i64;
 
+    pub fn LLVMDIBuilderCreateExpression(Builder: DIBuilderRef,
+                                         AddrOps: *const ValueRef,
+                                         AddrOpsCount: c_uint) -> ValueRef;
     pub fn LLVMDIBuilderCreateNameSpace(Builder: DIBuilderRef,
                                         Scope: DIScope,
                                         Name: *const c_char,

src/librustc_trans/back/link.rs

@@ -858,7 +858,8 @@ pub fn link_pnacl_module(sess: &Session,
 
     // Internalize everything.
     unsafe {
-        let reachable = vec!("_start\0".as_ptr());
+        let reachable = vec!("_start\0".as_ptr(),
+                             "__pnacl_eh_stack\0".as_ptr());
         llvm::LLVMRustRunRestrictionPass(llmod,
                                          reachable.as_ptr() as *const *const libc::c_char,
                                          reachable.len() as libc::size_t);
@@ -883,7 +884,8 @@ pub fn link_pnacl_module(sess: &Session,
             llvm::LLVMRustAddAnalysisPasses(tm, pm, llmod);
 
             let ap = |&: s: &'static str| {
-                assert!(llvm::LLVMRustAddPass(pm, s.as_ptr() as *const i8));
+                assert!(llvm::LLVMRustAddPass(pm, s.as_ptr() as *const i8),
+                        "failed to add pass `{}`", s.slice(0, s.len() - 1));
             };
 
             ap("pnacl-sjlj-eh\0");
@@ -912,15 +914,15 @@ pub fn link_pnacl_module(sess: &Session,
             ap("constmerge\0");
             ap("flatten-globals\0");
             ap("expand-constant-expr\0");
+            ap("nacl-expand-ints\0");
             ap("nacl-promote-ints\0");
             ap("expand-getelementptr\0");
             ap("nacl-rewrite-atomics\0");
             ap("expand-struct-regs\0");
             ap("remove-asm-memory\0");
             ap("simplify-allocas\0");
             ap("replace-ptrs-with-ints\0");
-            ap("combine-noop-casts\0");
-            ap("expand-constant-expr\0");
+            ap("expand-struct-regs\0");
             ap("strip-dead-prototypes\0");
             ap("die\0");
             ap("dce\0");
@@ -966,11 +968,13 @@ pub fn link_pnacl_module(sess: &Session,
             let pm = llvm::LLVMCreatePassManager();
 
             let ap = |&: s: &'static str| {
-                assert!(llvm::LLVMRustAddPass(pm, s.as_ptr() as *const i8));
+                assert!(llvm::LLVMRustAddPass(pm, s.as_ptr() as *const i8),
+                        "failed to add pass `{}`", s.slice(0, s.len() - 1));
             };
 
             // Strip unsupported metadata:
             ap("strip-metadata\0");
+            ap("strip-module-flags\0");
             ap("nacl-strip-attributes\0");
 
             if !sess.no_verify() {

src/librustc_trans/trans/context.rs

@@ -745,6 +745,7 @@ pub fn declare_intrinsic(ccx: &CrateContext, key: & &'static str) -> Option<Valu
                 // HACK(eddyb) dummy output type, shouln't affect anything.
                 let f = base::decl_cdecl_fn(ccx, name, Type::func(&[], &$ret),
                                             ty::mk_nil(ccx.tcx()));
+                if ccx.sess().targeting_pnacl() { llvm::SetUnnamedAddr(f, false); }
                 ccx.intrinsics().borrow_mut().insert(name, f);
                 return Some(f);
             } else if is_key { return None; }
@@ -759,6 +760,7 @@ pub fn declare_intrinsic(ccx: &CrateContext, key: & &'static str) -> Option<Valu
                  let f = base::decl_cdecl_fn(ccx, name,
                                              Type::func(&[$($arg),*], &$ret),
                                              ty::mk_nil(ccx.tcx()));
+                 if ccx.sess().targeting_pnacl() { llvm::SetUnnamedAddr(f, false); }
                  ccx.intrinsics().borrow_mut().insert(name, f);
                  return Some(f);
              } else if is_key { return None; }

src/librustc_trans/trans/debuginfo.rs

@@ -1655,7 +1655,7 @@ fn declare_local<'blk, 'tcx>(bcx: Block<'blk, 'tcx>,
         CapturedVariable => (0, DW_TAG_auto_variable)
     };
 
-    let name = CString::from_slice(name.get().as_bytes());
+    let name = CString::from_slice(name.as_bytes());
     match (variable_access, [].as_slice()) {
         (DirectVariable { alloca }, address_operations) |
         (IndirectVariable {alloca, address_operations}, _) => {
@@ -4016,14 +4016,24 @@ fn namespace_for_item(cx: &CrateContext, def_id: ast::DefId) -> Rc<NamespaceTree
 /// Inserts a side-effect free instruction sequence that makes sure that the
 /// .debug_gdb_scripts global is referenced, so it isn't removed by the linker.
 pub fn insert_reference_to_gdb_debug_scripts_section_global(ccx: &CrateContext) {
+    use trans::common::C_i32;
     if needs_gdb_debug_scripts_section(ccx) {
         let empty = CString::from_slice(b"");
         let gdb_debug_scripts_section_global =
             get_or_insert_gdb_debug_scripts_section_global(ccx);
         unsafe {
+            // PNaCl's -nacl-rewrite-atomics can't rewrite loading directly from
+            // gdb_debug_scripts_section_global.
+            let indices = [C_i32(ccx, 0), C_i32(ccx, 0)];
+            let element =
+                llvm::LLVMBuildInBoundsGEP(ccx.raw_builder(),
+                                           gdb_debug_scripts_section_global,
+                                           indices.as_ptr(),
+                                           indices.len() as c_uint,
+                                           empty.as_ptr());
             let volative_load_instruction =
                 llvm::LLVMBuildLoad(ccx.raw_builder(),
-                                    gdb_debug_scripts_section_global,
+                                    element,
                                     empty.as_ptr());
             llvm::LLVMSetVolatile(volative_load_instruction, llvm::True);
         }

src/llvm

@@ -89,13 +89,8 @@ extern "C" LLVMExecutionEngineRef LLVMBuildExecutionEngine(
     options.NoFramePointerElim = true;
 
     ExecutionEngine *ee =
-    #if LLVM_VERSION_MINOR <= 5
-        EngineBuilder(unwrap(mod))
+      EngineBuilder(std::unique_ptr<Module>(unwrap(mod)))
             .setMCJITMemoryManager(unwrap(mref))
-    #else
-        EngineBuilder(std::unique_ptr<Module>(unwrap(mod)))
-            .setMCJITMemoryManager(std::unique_ptr<RustJITMemoryManager>(unwrap(mref)))
-    #endif
             .setEngineKind(EngineKind::JIT)
             .setErrorStr(&error_str)
             .setTargetOptions(options)

src/rustllvm/ExecutionEngineWrapper.cpp

@@ -47,16 +47,16 @@ LLVMInitializePasses() {
   initializeTarget(Registry);
 
   initializeAddPNaClExternalDeclsPass(Registry);
+  initializeBackendCanonicalizePass(Registry);
   initializeCanonicalizeMemIntrinsicsPass(Registry);
-  initializeCombineNoopCastsPass(Registry);
-  initializeCombineVectorInstructionsPass(Registry);
   initializeConstantInsertExtractElementIndexPass(Registry);
   initializeExpandArithWithOverflowPass(Registry);
   initializeExpandByValPass(Registry);
   initializeExpandConstantExprPass(Registry);
   initializeExpandCtorsPass(Registry);
   initializeExpandGetElementPtrPass(Registry);
   initializeExpandIndirectBrPass(Registry);
+  initializeExpandLargeIntegersPass(Registry);
   initializeExpandShuffleVectorPass(Registry);
   initializeExpandSmallArgumentsPass(Registry);
   initializeExpandStructRegsPass(Registry);
@@ -80,9 +80,10 @@ LLVMInitializePasses() {
   initializeRewriteAtomicsPass(Registry);
   initializeRewriteLLVMIntrinsicsPass(Registry);
   initializeRewritePNaClLibraryCallsPass(Registry);
+  initializeSimplifyAllocasPass(Registry);
   initializeStripAttributesPass(Registry);
   initializeStripMetadataPass(Registry);
-  initializeSimplifyAllocasPass(Registry);
+  initializeStripModuleFlagsPass(Registry);
 }
 
 extern "C" bool
@@ -288,7 +289,12 @@ LLVMRustAddPrinterPass(LLVMPassManagerRef PMR,
   PassManager *PM = unwrap<PassManager>(PMR);
   std::string ErrorInfo;
 
-#if LLVM_VERSION_MINOR >= 4
+#if LLVM_VERSION_MINOR >= 6
+  std::error_code EC;
+  raw_fd_ostream* OS = new raw_fd_ostream(path, EC, sys::fs::F_None);
+  if (EC)
+    ErrorInfo = EC.message();
+#elif LLVM_VERSION_MINOR >= 4
   raw_fd_ostream* OS = new raw_fd_ostream(path, ErrorInfo, sys::fs::F_None);
 #else
   raw_fd_ostream* OS = new raw_fd_ostream(path, ErrorInfo, raw_fd_ostream::F_Binary);