Merge #598

598: Hello world r=philberty a=philberty

```rust
extern "C" {
    fn puts(s: *const i8);
}

fn main() {
    unsafe {
        let a = "Hello World\0";
        let b = a as *const str;
        let c = b as *const i8;
        puts(c);
    }
}
```

Fixes #421

Co-authored-by: Philip Herron <philip.herron@embecosm.com>

2 files changed, 30 insertions, 0 deletions

diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc
index 40b5167..69fbe25 100644
--- a/gcc/rust/util/rust-hir-map.cc
+++ b/gcc/rust/util/rust-hir-map.cc
@@ -284,6 +284,30 @@ Mappings::lookup_hir_trait_item (CrateNum crateNum, HirId id)
 }
 
 void
+Mappings::insert_hir_extern_item (CrateNum crateNum, HirId id,
+				  HIR::ExternalItem *item)
+{
+  rust_assert (lookup_hir_extern_item (crateNum, id) == nullptr);
+
+  hirExternItemMappings[crateNum][id] = item;
+  nodeIdToHirMappings[crateNum][item->get_mappings ().get_nodeid ()] = id;
+}
+
+HIR::ExternalItem *
+Mappings::lookup_hir_extern_item (CrateNum crateNum, HirId id)
+{
+  auto it = hirExternItemMappings.find (crateNum);
+  if (it == hirExternItemMappings.end ())
+    return nullptr;
+
+  auto iy = it->second.find (id);
+  if (iy == it->second.end ())
+    return nullptr;
+
+  return iy->second;
+}
+
+void
 Mappings::insert_hir_impl_block (CrateNum crateNum, HirId id,
 				 HIR::ImplBlock *item)
 {
diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h
index 3789b57..7e5449c 100644
--- a/gcc/rust/util/rust-hir-map.h
+++ b/gcc/rust/util/rust-hir-map.h
@@ -132,6 +132,10 @@ public:
 			      HIR::TraitItem *item);
   HIR::TraitItem *lookup_hir_trait_item (CrateNum crateNum, HirId id);
 
+  void insert_hir_extern_item (CrateNum crateNum, HirId id,
+			       HIR::ExternalItem *item);
+  HIR::ExternalItem *lookup_hir_extern_item (CrateNum crateNum, HirId id);
+
   void insert_hir_impl_block (CrateNum crateNum, HirId id,
 			      HIR::ImplBlock *item);
   HIR::ImplBlock *lookup_hir_impl_block (CrateNum crateNum, HirId id);
@@ -239,6 +243,8 @@ private:
   std::map<HirId, HIR::ImplBlock *> hirImplItemsToImplMappings;
   std::map<CrateNum, std::map<HirId, HIR::ImplBlock *> > hirImplBlockMappings;
   std::map<CrateNum, std::map<HirId, HIR::TraitItem *> > hirTraitItemMappings;
+  std::map<CrateNum, std::map<HirId, HIR::ExternalItem *> >
+    hirExternItemMappings;
 
   // location info
   std::map<CrateNum, std::map<NodeId, Location> > locations;