1 files changed, 18 insertions, 16 deletions
diff --git a/lldb/include/lldb/API/SBInstruction.h b/lldb/include/lldb/API/SBInstruction.h
index d64a4d3da0d..7ebdcfc4756 100644
--- a/lldb/include/lldb/API/SBInstruction.h
+++ b/lldb/include/lldb/API/SBInstruction.h
@@ -17,43 +17,45 @@
 // There's a lot to be fixed here, but need to wait for underlying insn implementation
 // to be revised & settle down first.
 
-//class lldb_private::Disassembler::Instruction;
-
 namespace lldb {
 
 class SBInstruction
 {
 public:
 
-    //SBInstruction (lldb_private::Disassembler::Instruction *lldb_insn);
-
     SBInstruction ();
 
     ~SBInstruction ();
 
-    //bool
-    //IsValid();
+    bool
+    IsValid();
 
-    //size_t
-    //GetByteSize ();
+    SBAddress
+    GetAddress();
 
-    //void
-    //SetByteSize (size_t byte_size);
+    size_t
+    GetByteSize ();
 
-    //bool
-    //DoesBranch ();
+    bool
+    DoesBranch ();
 
     void
     Print (FILE *out);
 
-    //bool
-    //GetDescription (lldb::SBStream &description);
+    bool
+    GetDescription (lldb::SBStream &description);
 
-private:
+protected:
+    friend class SBInstructionList;
 
-    //lldb_private::Disassembler::Instruction::SharedPtr  m_opaque_sp;
+    SBInstruction (const lldb::InstructionSP &inst_sp);
 
+    void
+    SetOpaque (const lldb::InstructionSP &inst_sp);
+
+private:
 
+    lldb::InstructionSP  m_opaque_sp;
 };