]> granicus.if.org Git - clang/commitdiff
Driver: Fix possible crash when targetting an unknown (unsupported) Darwin
authorDaniel Dunbar <daniel@zuster.org>
Sat, 20 Mar 2010 00:50:21 +0000 (00:50 +0000)
committerDaniel Dunbar <daniel@zuster.org>
Sat, 20 Mar 2010 00:50:21 +0000 (00:50 +0000)
platform, e.g. ppc.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@99016 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Driver/ToolChains.h
lib/Driver/Tools.cpp

index 6dd64dec9ee33227dd40a617bd2d610e66a9fe5a..0d5b2a3f47476ee549a530a57ee57d474adacd90 100644 (file)
@@ -96,6 +96,8 @@ public:
     return TargetIsIPhoneOS;
   }
 
+  bool isTargetInitialized() const { return TargetInitialized; }
+
   void getTargetVersion(unsigned (&Res)[3]) const {
     assert(TargetInitialized && "Target not initialized!");
     Res[0] = TargetVersion[0];
index 86b46856d3655762297594a13343ed74f12512a2..58a4cdb89b3cc9522b66503dd6e1b4494238e0e1 100644 (file)
@@ -655,6 +655,12 @@ static std::string getEffectiveClangTriple(const Driver &D,
   } else {
     const toolchains::Darwin &DarwinTC(
       reinterpret_cast<const toolchains::Darwin&>(TC));
+
+    // If the target isn't initialized (e.g., an unknown Darwin platform, return
+    // the default triple).
+    if (!DarwinTC.isTargetInitialized())
+      return Triple.getTriple();
+    
     unsigned Version[3];
     DarwinTC.getTargetVersion(Version);