Allow unsafe extern on all editions

Author: spastorino

compiler/rustc_ast_passes/src/ast_validation.rs

@@ -1021,15 +1021,12 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
                 walk_list!(self, visit_attribute, &item.attrs);
                 return; // Avoid visiting again.
             }
-            ItemKind::ForeignMod(ForeignMod { abi, unsafety, .. }) => {
+            ItemKind::ForeignMod(ForeignMod { abi, .. }) => {
                 let old_item = mem::replace(&mut self.extern_mod, Some(item));
                 self.visibility_not_permitted(
                     &item.vis,
                     errors::VisibilityNotPermittedNote::IndividualForeignItems,
                 );
-                if let &Unsafe::Yes(span) = unsafety {
-                    self.dcx().emit_err(errors::UnsafeItem { span, kind: "extern block" });
-                }
                 if abi.is_none() {
                     self.maybe_lint_missing_abi(item.span, item.id);
                 }

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -567,15 +567,29 @@ pub enum ArchiveKind {
 }
 
 // LLVMRustThinLTOData
+#[cfg(bootstrap)]
 extern "C" {
     pub type ThinLTOData;
 }
 
 // LLVMRustThinLTOBuffer
+#[cfg(bootstrap)]
 extern "C" {
     pub type ThinLTOBuffer;
 }
 
+// LLVMRustThinLTOData
+#[cfg(not(bootstrap))]
+unsafe extern "C" {
+    pub type ThinLTOData;
+}
+
+// LLVMRustThinLTOBuffer
+#[cfg(not(bootstrap))]
+unsafe extern "C" {
+    pub type ThinLTOBuffer;
+}
+
 /// LLVMRustThinLTOModule
 #[repr(C)]
 pub struct ThinLTOModule {
@@ -634,30 +648,71 @@ struct InvariantOpaque<'a> {
 }
 
 // Opaque pointer types
+#[cfg(bootstrap)]
 extern "C" {
     pub type Module;
 }
+#[cfg(bootstrap)]
 extern "C" {
     pub type Context;
 }
+#[cfg(bootstrap)]
 extern "C" {
     pub type Type;
 }
+#[cfg(bootstrap)]
 extern "C" {
     pub type Value;
 }
+#[cfg(bootstrap)]
 extern "C" {
     pub type ConstantInt;
 }
+#[cfg(bootstrap)]
 extern "C" {
     pub type Attribute;
 }
+#[cfg(bootstrap)]
 extern "C" {
     pub type Metadata;
 }
+#[cfg(bootstrap)]
 extern "C" {
     pub type BasicBlock;
 }
+#[cfg(not(bootstrap))]
+unsafe extern "C" {
+    pub type Module;
+}
+#[cfg(not(bootstrap))]
+unsafe extern "C" {
+    pub type Context;
+}
+#[cfg(not(bootstrap))]
+unsafe extern "C" {
+    pub type Type;
+}
+#[cfg(not(bootstrap))]
+unsafe extern "C" {
+    pub type Value;
+}
+#[cfg(not(bootstrap))]
+unsafe extern "C" {
+    pub type ConstantInt;
+}
+#[cfg(not(bootstrap))]
+unsafe extern "C" {
+    pub type Attribute;
+}
+#[cfg(not(bootstrap))]
+unsafe extern "C" {
+    pub type Metadata;
+}
+#[cfg(not(bootstrap))]
+unsafe extern "C" {
+    pub type BasicBlock;
+}
+
 #[repr(C)]
 pub struct Builder<'a>(InvariantOpaque<'a>);
 #[repr(C)]

compiler/rustc_llvm/src/lib.rs

@@ -43,9 +43,14 @@ pub fn initialize_available_targets() {
         ($cfg:meta, $($method:ident),*) => { {
             #[cfg($cfg)]
             fn init() {
+                #[cfg(bootstrap)]
                 extern "C" {
                     $(fn $method();)*
                 }
+                #[cfg(not(bootstrap))]
+                unsafe extern "C" {
+                    $(fn $method();)*
+                }
                 unsafe {
                     $($method();)*
                 }

compiler/rustc_middle/src/ty/list.rs

@@ -61,12 +61,20 @@ impl<T> Default for &List<T> {
     }
 }
 
+#[cfg(bootstrap)]
 extern "C" {
     /// A dummy type used to force `List` to be unsized while not requiring
     /// references to it be wide pointers.
     type OpaqueListContents;
 }
 
+#[cfg(not(bootstrap))]
+unsafe extern "C" {
+    /// A dummy type used to force `List` to be unsized while not requiring
+    /// references to it be wide pointers.
+    type OpaqueListContents;
+}
+
 impl<H, T> RawList<H, T> {
     #[inline(always)]
     pub fn len(&self) -> usize {

tests/ui/parser/unsafe-foreign-mod-2.rs

@@ -1,8 +1,7 @@
 extern "C" unsafe {
-               //~^ ERROR expected `{`, found keyword `unsafe`
-               //~| ERROR extern block cannot be declared unsafe
+    //~^ ERROR expected `{`, found keyword `unsafe`
     unsafe fn foo();
-        //~^ ERROR functions in `extern` blocks cannot have qualifiers
+    //~^ ERROR functions in `extern` blocks cannot have qualifiers
 }
 
 fn main() {}

tests/ui/parser/unsafe-foreign-mod-2.stderr

@@ -4,20 +4,14 @@ error: expected `{`, found keyword `unsafe`
 LL | extern "C" unsafe {
    |            ^^^^^^ expected `{`
 
-error: extern block cannot be declared unsafe
-  --> $DIR/unsafe-foreign-mod-2.rs:1:12
-   |
-LL | extern "C" unsafe {
-   |            ^^^^^^
-
 error: functions in `extern` blocks cannot have qualifiers
-  --> $DIR/unsafe-foreign-mod-2.rs:4:5
+  --> $DIR/unsafe-foreign-mod-2.rs:3:5
    |
 LL | extern "C" unsafe {
    | ----------------- in this `extern` block
-...
+LL |
 LL |     unsafe fn foo();
    |     ^^^^^^ help: remove this qualifier
 
-error: aborting due to 3 previous errors
+error: aborting due to 2 previous errors
 

tests/ui/parser/unsafe-foreign-mod.rs

@@ -1,5 +1,5 @@
-unsafe extern "C" {
-    //~^ ERROR extern block cannot be declared unsafe
-}
+//@ build-pass
+
+unsafe extern "C" {}
 
 fn main() {}

tests/ui/parser/unsafe-foreign-mod.stderr

@@ -1,10 +1,11 @@
+//@ build-pass
+
 extern "C" {
     static TEST1: i32;
     fn test1(i: i32);
 }
 
 unsafe extern "C" {
-    //~^ ERROR: extern block cannot be declared unsafe
     static TEST2: i32;
     fn test2(i: i32);
 }