Adapt code to latest rustc master changes

Author: denismerigoux

src/librustc_codegen_llvm/debuginfo/metadata.rs

@@ -1774,13 +1774,7 @@ pub fn create_vtable_metadata(
         llvm::LLVMRustDIBuilderCreateStaticVariable(DIB(cx),
                                                     NO_SCOPE_METADATA,
                                                     name.as_ptr(),
-                                                    // LLVM 3.9
-                                                    // doesn't accept
-                                                    // null here, so
-                                                    // pass the name
-                                                    // as the linkage
-                                                    // name.
-                                                    name.as_ptr(),
+                                                    ptr::null(),
                                                     unknown_file_metadata(cx),
                                                     UNKNOWN_LINE_NUMBER,
                                                     vtable_type,
@@ -1806,62 +1800,3 @@ pub fn extend_scope_to_file(
             file_metadata)
     }
 }
-
-impl DebugInfoMethods<'tcx> for CodegenCx<'ll, 'tcx, &'ll Value> {
-
-    /// Creates debug information for the given vtable, which is for the
-    /// given type.
-    ///
-    /// Adds the created metadata nodes directly to the crate's IR.
-    fn create_vtable_metadata(
-        &self,
-        ty: ty::Ty<'tcx>,
-        vtable: &'ll Value,
-    ) {
-        if self.dbg_cx.is_none() {
-            return;
-        }
-
-        let type_metadata = type_metadata(&self, ty, syntax_pos::DUMMY_SP);
-
-        unsafe {
-            // LLVMRustDIBuilderCreateStructType() wants an empty array. A null
-            // pointer will lead to hard to trace and debug LLVM assertions
-            // later on in llvm/lib/IR/Value.cpp.
-            let empty_array = create_DIArray(DIB(&self), &[]);
-
-            let name = const_cstr!("vtable");
-
-            // Create a new one each time.  We don't want metadata caching
-            // here, because each vtable will refer to a unique containing
-            // type.
-            let vtable_type = llvm::LLVMRustDIBuilderCreateStructType(
-                DIB(&self),
-                NO_SCOPE_METADATA,
-                name.as_ptr(),
-                unknown_file_metadata(&self),
-                UNKNOWN_LINE_NUMBER,
-                Size::ZERO.bits(),
-                self.tcx.data_layout.pointer_align.abi_bits() as u32,
-                DIFlags::FlagArtificial,
-                None,
-                empty_array,
-                0,
-                Some(type_metadata),
-                name.as_ptr()
-            );
-
-            llvm::LLVMRustDIBuilderCreateStaticVariable(DIB(&self),
-                                                        NO_SCOPE_METADATA,
-                                                        name.as_ptr(),
-                                                        ptr::null(),
-                                                        unknown_file_metadata(&self),
-                                                        UNKNOWN_LINE_NUMBER,
-                                                        vtable_type,
-                                                        true,
-                                                        vtable,
-                                                        None,
-                                                        0);
-        }
-    }
-}

src/librustc_codegen_llvm/debuginfo/mod.rs

@@ -356,13 +356,13 @@ impl<'ll, 'tcx: 'll> DebugInfoMethods<'ll, 'tcx> for CodegenCx<'ll, 'tcx, &'ll V
         let mut flags = DIFlags::FlagPrototyped;
 
     let local_id = self.tcx().hir.as_local_node_id(def_id);
-    if let Some((id, _, _)) = *cx.sess().entry_fn.borrow() {
+    if let Some((id, _, _)) = *self.sess().entry_fn.borrow() {
         if local_id == Some(id) {
             flags |= DIFlags::FlagMainSubprogram;
         }
     }
 
-    if cx.layout_of(sig.output()).abi.is_uninhabited() {
+    if self.layout_of(sig.output()).abi.is_uninhabited() {
         flags |= DIFlags::FlagNoReturn;
     }
 

src/librustc_codegen_llvm/declare.rs

@@ -146,7 +146,7 @@ impl DeclareMethods<'ll, 'tcx> for CodegenCx<'ll, 'tcx, &'ll Value> {
         let fty = FnType::new(self, sig, &[]);
         let llfn = declare_raw_fn(self, name, fty.llvm_cconv(), fty.llvm_type(self));
 
-        if self.layout_of(sig.output()).abi == layout::Abi::Uninhabited {
+        if self.layout_of(sig.output()).abi.is_uninhabited() {
             llvm::Attribute::NoReturn.apply_llfn(Function, llfn);
         }