commit 6c6be946fcae222dc192b7edb060f2370a9ace8a
author Sean Callanan <scallanan@apple.com> Thu Apr 07 01:56:01 2011 +0000
committer Sean Callanan <scallanan@apple.com> Thu Apr 07 01:56:01 2011 +0000
tree 254fe1d97714e73102343e43ac08d0fe623053db
parent 313ec7953a783b17f57ac15788cdf71db77ecd55

Fixed a bug where missing EDInstInfo would cause
tokenization to crash and burn.

llvm-svn: 129051

llvm/lib/MC/MCDisassembler/EDInst.cpp

diff --git a/llvm/lib/MC/MCDisassembler/EDInst.cpp b/llvm/lib/MC/MCDisassembler/EDInst.cpp
index 63b049f..6057e16 100644
--- a/llvm/lib/MC/MCDisassembler/EDInst.cpp
+++ b/llvm/lib/MC/MCDisassembler/EDInst.cpp
@@ -165,6 +165,9 @@
 int EDInst::tokenize() {
   if (TokenizeResult.valid())
     return TokenizeResult.result();
+    
+  if (ThisInstInfo == NULL)
+    return TokenizeResult.setResult(-1);
   
   if (stringify())
     return TokenizeResult.setResult(-1);