diff --git a/lib/Transforms/IPO/InlineSimple.cpp b/lib/Transforms/IPO/InlineSimple.cpp
index b7cefacaf32..bd4fd26a9dd 100644
--- a/lib/Transforms/IPO/InlineSimple.cpp
+++ b/lib/Transforms/IPO/InlineSimple.cpp
@@ -70,6 +70,7 @@ bool opt::InlineMethod(BasicBlock::iterator CIIt) {
 
   CallInst *CI = (CallInst*)*CIIt;
   const Method *CalledMeth = CI->getCalledMethod();
+  if (CalledMeth->isExternal()) return false;  // Can't inline external method!
   Method *CurrentMeth = CI->getParent()->getParent();
 
   //cerr << "Inlining " << CalledMeth->getName() << " into " 
diff --git a/lib/Transforms/Scalar/SCCP.cpp b/lib/Transforms/Scalar/SCCP.cpp
index 63ce5125087..a28155260ee 100644
--- a/lib/Transforms/Scalar/SCCP.cpp
+++ b/lib/Transforms/Scalar/SCCP.cpp
@@ -515,6 +515,7 @@ void SCCP::OperandChangedState(User *U) {
 // to prove whether a value is constant and whether blocks are used.
 //
 bool opt::DoSCCP(Method *M) {
+  if (M->isExternal()) return false;
   SCCP S(M);
   return S.doSCCP();
 }