From ab50f174120d5ce566f2abdcfaee87fab90fb89b Mon Sep 17 00:00:00 2001
From: Jakob Stoklund Olesen <jolesen@mozilla.com>
Date: Fri, 29 Apr 2016 17:23:34 -0700
Subject: [PATCH] Implement Index<Inst/StackSlot> for Function.

When Function serves as a container for IL entities, use the Index trait to
translate a reference class to a Data object.

Works for:

- StackSlot -> StackSlotData
- Inst -> InstructionData
---
 cranelift/src/libcretonne/repr.rs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/cranelift/src/libcretonne/repr.rs b/cranelift/src/libcretonne/repr.rs
index 3917fa8f48..c219ecb4b3 100644
--- a/cranelift/src/libcretonne/repr.rs
+++ b/cranelift/src/libcretonne/repr.rs
@@ -261,6 +261,15 @@ impl Display for Inst {
     }
 }
 
+/// Allow immutable access to instructions via function indexing.
+impl Index<Inst> for Function {
+    type Output = InstructionData;
+
+    fn index<'a>(&'a self, inst: Inst) -> &'a InstructionData {
+        &self.instructions[inst.index()]
+    }
+}
+
 // ====--------------------------------------------------------------------------------------====//
 //
 // Value implementation.
@@ -402,11 +411,6 @@ impl Function {
         }
     }
 
-    /// Resolve an instruction reference.
-    pub fn inst(&self, i: Inst) -> &InstructionData {
-        &self.instructions[i.0 as usize]
-    }
-
     /// Create a new instruction.
     pub fn make_inst(&mut self, data: InstructionData) -> Inst {
         let iref = Inst::new(self.instructions.len());
@@ -427,7 +431,7 @@ impl Function {
         use self::ExpandedValue::*;
         use self::ValueData::*;
         match v.expand() {
-            Direct(i) => self.inst(i).first_type(),
+            Direct(i) => self[i].first_type(),
             Table(i) => {
                 match self.extended_values[i] {
                     Unused => panic!("Can't get type of Unused value {}", v),
@@ -457,7 +461,7 @@ mod tests {
         assert_eq!(inst.to_string(), "inst0");
 
         // Immutable reference resolution.
-        let ins = func.inst(inst);
+        let ins = &func[inst];
         assert_eq!(ins.opcode(), Opcode::Iconst);
         assert_eq!(ins.first_type(), types::I32);
     }