Fix handling of coherence related lang_items

gcc/rust/ChangeLog:

	* hir/rust-ast-lower-base.cc
	(ASTLoweringBase::handle_lang_item_attribute): Check for COHERENCE_CORE.
	* util/rust-lang-item.h
	(RustLangItem::ItemType::COHERENCE_CORE): Add.
	(RustLangItem::Parse): Parse COHERENCE_CORE.
	(RustLangItem::ToString): Handle COHERENCE_CORE.

gcc/testsuite/ChangeLog:

	* rust/compile/lang-impl.rs: New test.

Author: powerboat9

gcc/rust/hir/rust-ast-lower-base.cc

@@ -785,8 +785,12 @@ ASTLoweringBase::handle_lang_item_attribute (const ItemWrapper &item,
       rust_error_at (attr.get_locus (), "unknown lang item");
       return;
     }
-  mappings->insert_lang_item (lang_item_type,
-			      item.get_mappings ().get_defid ());
+  else if (lang_item_type != Analysis::RustLangItem::ItemType::COHERENCE_CORE)
+    {
+      // TODO: bypass coherence checks
+      mappings->insert_lang_item (lang_item_type,
+				  item.get_mappings ().get_defid ());
+    }
 }
 
 bool

gcc/rust/util/rust-lang-item.h

@@ -68,11 +68,6 @@ class RustLangItem
     RANGE_INCLUSIVE,
     RANGE_TO_INCLUSIVE,
 
-    // https://github.com/rust-lang/rust/blob/master/library/core/src/ptr/const_ptr.rs
-    CONST_PTR,
-    MUT_PTR,
-    CONST_SLICE_PTR,
-
     // https://github.com/rust-lang/rust/blob/master/library/core/src/marker.rs
     PHANTOM_DATA,
 
@@ -85,6 +80,11 @@ class RustLangItem
     CLONE,
     SIZED,
 
+    // https://github.com/Rust-GCC/gccrs/issues/1896
+    // https://github.com/rust-lang/rust/commit/afbecc0f68c4dcfc4878ba5bcb1ac942544a1bdc
+    // https://github.com/Rust-GCC/gccrs/issues/1494
+    COHERENCE_CORE,
+
     // delimiter
     UNKNOWN,
   };
@@ -219,18 +219,6 @@ class RustLangItem
       {
 	return ItemType::RANGE_TO_INCLUSIVE;
       }
-    else if (item.compare ("const_ptr") == 0)
-      {
-	return ItemType::CONST_PTR;
-      }
-    else if (item.compare ("mut_ptr") == 0)
-      {
-	return ItemType::MUT_PTR;
-      }
-    else if (item.compare ("const_slice_ptr") == 0)
-      {
-	return ItemType::CONST_SLICE_PTR;
-      }
     else if (item.compare ("phantom_data") == 0)
       {
 	return ItemType::PHANTOM_DATA;
@@ -255,6 +243,27 @@ class RustLangItem
       {
 	return ItemType::SIZED;
       }
+    else if (item.compare ("slice_alloc") == 0
+	     || item.compare ("slice_u8_alloc") == 0
+	     || item.compare ("str_alloc") == 0 || item.compare ("array") == 0
+	     || item.compare ("bool") == 0 || item.compare ("char") == 0
+	     || item.compare ("f32") == 0 || item.compare ("f64") == 0
+	     || item.compare ("i8") == 0 || item.compare ("i16") == 0
+	     || item.compare ("i32") == 0 || item.compare ("i64") == 0
+	     || item.compare ("i128") == 0 || item.compare ("isize") == 0
+	     || item.compare ("u8") == 0 || item.compare ("u16") == 0
+	     || item.compare ("u32") == 0 || item.compare ("u64") == 0
+	     || item.compare ("u128") == 0 || item.compare ("usize") == 0
+	     || item.compare ("const_ptr") == 0
+	     || item.compare ("const_slice_ptr") == 0
+	     || item.compare ("mut_ptr") == 0
+	     || item.compare ("mut_slice_ptr") == 0
+	     || item.compare ("slice_u8") == 0 || item.compare ("slice") == 0
+	     || item.compare ("str") == 0 || item.compare ("f32_runtime") == 0
+	     || item.compare ("f64_runtime") == 0)
+      {
+	return ItemType::COHERENCE_CORE;
+      }
 
     return ItemType::UNKNOWN;
   }
@@ -346,6 +355,8 @@ class RustLangItem
       case SIZED:
 	return "sized";
 
+      case COHERENCE_CORE:
+	return "<COHERENCE_CORE>";
       case UNKNOWN:
 	return "<UNKNOWN>";
       }

gcc/testsuite/rust/compile/lang-impl.rs

@@ -0,0 +1,2 @@
+#[lang = "i8"]
+impl i32 {}