From 1e255aab650a7fa2047fd953cae65b12215280af Mon Sep 17 00:00:00 2001
From: rdivacky <rdivacky@FreeBSD.org>
Date: Sun, 21 Mar 2010 10:50:08 +0000
Subject: Update clang to r99115.

---
 lib/Driver/OptTable.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lib/Driver/OptTable.cpp')

diff --git a/lib/Driver/OptTable.cpp b/lib/Driver/OptTable.cpp
index f69d5d8..de1e459 100644
--- a/lib/Driver/OptTable.cpp
+++ b/lib/Driver/OptTable.cpp
@@ -167,11 +167,13 @@ Option *OptTable::CreateOption(unsigned id) const {
   if (info.Flags & RenderAsInput)
     Opt->setNoOptAsInput(true);
   if (info.Flags & RenderJoined) {
-    assert(info.Kind == Option::SeparateClass && "Invalid option.");
+    assert((info.Kind == Option::JoinedOrSeparateClass ||
+            info.Kind == Option::SeparateClass) && "Invalid option.");
     Opt->setForceJoinedRender(true);
   }
   if (info.Flags & RenderSeparate) {
-    assert(info.Kind == Option::JoinedClass && "Invalid option.");
+    assert((info.Kind == Option::JoinedOrSeparateClass ||
+            info.Kind == Option::JoinedClass) && "Invalid option.");
     Opt->setForceSeparateRender(true);
   }
   if (info.Flags & Unsupported)
-- 
cgit v1.1