Un-namespace-qualify llvm_unreachable. It's a macro, so the qualification gave

no extra safety anyway.

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

diff --git a/include/clang/AST/TemplateBase.h b/include/clang/AST/TemplateBase.h
index ee01d6695dceea47f9bf63e61a47c65f2fae2c78..fe037992ad2fb4833463209e2f19aff52f69c834 100644 (file)
--- a/include/clang/AST/TemplateBase.h
+++ b/include/clang/AST/TemplateBase.h
@@ -356,7 +356,7 @@ public:
       assert(Kind == K_None);
       break;
     case TemplateArgument::Null:
-      llvm::llvm_unreachable("source info for null template argument?");
+      llvm_unreachable("source info for null template argument?");
     }
   }
 #endif

diff --git a/include/clang/AST/TypeLocVisitor.h b/include/clang/AST/TypeLocVisitor.h
index a62bb3f853bc179e1f076701e3953aeab7c91b7f..95ec175a53a4334812406584e6457094cb759e3d 100644 (file)
--- a/include/clang/AST/TypeLocVisitor.h
+++ b/include/clang/AST/TypeLocVisitor.h
@@ -33,7 +33,7 @@ public:
     case TypeLoc::CLASS: DISPATCH(CLASS##TypeLoc);
 #include "clang/AST/TypeLocNodes.def"
     }
-    llvm::llvm_unreachable("unexpected type loc class!");
+    llvm_unreachable("unexpected type loc class!");
   }
 
   RetTy Visit(UnqualTypeLoc TyLoc) {

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 212dd353c31799dbe15cfa9d9b19636666bb1ff5..95934747d07f12cccdf346f77292fbd9bbf216d0 100644 (file)
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -1214,7 +1214,7 @@ TagDecl* TagDecl::getDefinition(ASTContext& C) const {
 
 TagDecl::TagKind TagDecl::getTagKindForTypeSpec(unsigned TypeSpec) {
   switch (TypeSpec) {
-  default: llvm::llvm_unreachable("unexpected type specifier");
+  default: llvm_unreachable("unexpected type specifier");
   case DeclSpec::TST_struct: return TK_struct;
   case DeclSpec::TST_class: return TK_class;
   case DeclSpec::TST_union: return TK_union;

diff --git a/lib/AST/Expr.cpp b/lib/AST/Expr.cpp
index 6eca6a1fa2432aca40c763229320d6a9b510022b..6d9a26899331cc76a1f906b42cf4ebe82dc71002 100644 (file)
--- a/lib/AST/Expr.cpp
+++ b/lib/AST/Expr.cpp
@@ -1813,7 +1813,7 @@ bool Expr::isIntegerConstantExpr(llvm::APSInt &Result, ASTContext &Ctx,
   }
   EvalResult EvalResult;
   if (!Evaluate(EvalResult, Ctx))
-    llvm::llvm_unreachable("ICE cannot be evaluated!");
+    llvm_unreachable("ICE cannot be evaluated!");
   assert(!EvalResult.HasSideEffects && "ICE with side effects!");
   assert(EvalResult.Val.isInt() && "ICE that isn't integer!");
   Result = EvalResult.Val.getInt();

diff --git a/lib/Analysis/AnalysisContext.cpp b/lib/Analysis/AnalysisContext.cpp
index 3a6cf42a3d75b21b8c429477cdbb38694e5e3db5..05e5196c5b971f1837c53f6d7356c3836fa4d9c6 100644 (file)
--- a/lib/Analysis/AnalysisContext.cpp
+++ b/lib/Analysis/AnalysisContext.cpp
@@ -39,7 +39,7 @@ Stmt *AnalysisContext::getBody() {
   else if (const BlockDecl *BD = dyn_cast<BlockDecl>(D))
     return BD->getBody();
 
-  llvm::llvm_unreachable("unknown code decl");
+  llvm_unreachable("unknown code decl");
 }
 
 const ImplicitParamDecl *AnalysisContext::getSelfDecl() const {

diff --git a/lib/CodeGen/CGException.cpp b/lib/CodeGen/CGException.cpp
index 07e7546637c95a043a343ca4cee980a69923bca7..0f201b5601c69cd8a7264b793f7e7d0f3222f6a1 100644 (file)
--- a/lib/CodeGen/CGException.cpp
+++ b/lib/CodeGen/CGException.cpp
@@ -182,7 +182,7 @@ static void CopyObject(CodeGenFunction &CGF, const Expr *E,
                    Callee, CallArgs, CopyCtor);
       CGF.setInvokeDest(PrevLandingPad);
     } else
-      llvm::llvm_unreachable("uncopyable object");
+      llvm_unreachable("uncopyable object");
   }
 }
 
@@ -223,7 +223,7 @@ static void CopyObject(CodeGenFunction &CGF, QualType ObjectType,
       CGF.EmitCall(CGF.CGM.getTypes().getFunctionInfo(ResultType, CallArgs),
                    Callee, CallArgs, CopyCtor);
     } else
-      llvm::llvm_unreachable("uncopyable object");
+      llvm_unreachable("uncopyable object");
   }
 }
 

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 1cfcfb1ab16f8daca1f776d930cf3f9b9edcbfe0..761f34309bd6586c94aa595891ba49f47c1af6d6 100644 (file)
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -891,7 +891,7 @@ GetLinkageForVariable(ASTContext &Context, const VarDecl *VD) {
       return CodeGenModule::GVA_StrongExternal;
       
     case TSK_ExplicitInstantiationDeclaration:
-      llvm::llvm_unreachable("Variable should not be instantiated");
+      llvm_unreachable("Variable should not be instantiated");
       // Fall through to treat this like any other instantiation.
         
     case TSK_ImplicitInstantiation:

diff --git a/lib/CodeGen/Mangle.cpp b/lib/CodeGen/Mangle.cpp
index afc70fa479aabc3d39185e8b496c62faf9cd0dc2..2833484b78ca96a34bb858bb1718a0c99ba0f1d6 100644 (file)
--- a/lib/CodeGen/Mangle.cpp
+++ b/lib/CodeGen/Mangle.cpp
@@ -742,7 +742,7 @@ void CXXNameMangler::mangleType(QualType T) {
 #define ABSTRACT_TYPE(CLASS, PARENT)
 #define NON_CANONICAL_TYPE(CLASS, PARENT) \
     case Type::CLASS: \
-      llvm::llvm_unreachable("can't mangle non-canonical type " #CLASS "Type"); \
+      llvm_unreachable("can't mangle non-canonical type " #CLASS "Type"); \
       return;
 #define TYPE(CLASS, PARENT) \
     case Type::CLASS: \
@@ -836,7 +836,7 @@ void CXXNameMangler::mangleType(const FunctionProtoType *T) {
   Out << 'E';
 }
 void CXXNameMangler::mangleType(const FunctionNoProtoType *T) {
-  llvm::llvm_unreachable("Can't mangle K&R function prototypes");
+  llvm_unreachable("Can't mangle K&R function prototypes");
 }
 void CXXNameMangler::mangleBareFunctionType(const FunctionType *T,
                                             bool MangleReturnType) {

diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index af639523f1d7e786fed2167b775bc9d8c2a8b3c4..420573dea2a8b6d688d5a600592dc16cd1314335 100644 (file)
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -510,7 +510,7 @@ DerivedArgList *Darwin::TranslateArgs(InputArgList &Args,
       DAL->append(DAL->MakeJoinedArg(0, MArch, "armv7a"));
 
     else
-      llvm::llvm_unreachable("invalid Darwin arch");
+      llvm_unreachable("invalid Darwin arch");
   }
 
   return DAL;

diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
index 3b9d5d07a025fe96fa186ab4fce3d49f9bbfc9ba..61995b43676ba1c9a4c77a904caea40330c528b9 100644 (file)
--- a/lib/Frontend/CompilerInvocation.cpp
+++ b/lib/Frontend/CompilerInvocation.cpp
@@ -31,7 +31,7 @@ using namespace clang;
 static const char *getAnalysisName(Analyses Kind) {
   switch (Kind) {
   default:
-    llvm::llvm_unreachable("Unknown analysis kind!");
+    llvm_unreachable("Unknown analysis kind!");
 #define ANALYSIS(NAME, CMDFLAG, DESC, SCOPE)\
   case NAME: return "-" CMDFLAG;
 #include "clang/Frontend/Analyses.def"
@@ -41,7 +41,7 @@ static const char *getAnalysisName(Analyses Kind) {
 static const char *getAnalysisStoreName(AnalysisStores Kind) {
   switch (Kind) {
   default:
-    llvm::llvm_unreachable("Unknown analysis store!");
+    llvm_unreachable("Unknown analysis store!");
 #define ANALYSIS_STORE(NAME, CMDFLAG, DESC, CREATFN) \
   case NAME##Model: return CMDFLAG;
 #include "clang/Frontend/Analyses.def"
@@ -51,7 +51,7 @@ static const char *getAnalysisStoreName(AnalysisStores Kind) {
 static const char *getAnalysisConstraintName(AnalysisConstraints Kind) {
   switch (Kind) {
   default:
-    llvm::llvm_unreachable("Unknown analysis constraints!");
+    llvm_unreachable("Unknown analysis constraints!");
 #define ANALYSIS_CONSTRAINTS(NAME, CMDFLAG, DESC, CREATFN) \
   case NAME##Model: return CMDFLAG;
 #include "clang/Frontend/Analyses.def"
@@ -61,7 +61,7 @@ static const char *getAnalysisConstraintName(AnalysisConstraints Kind) {
 static const char *getAnalysisDiagClientName(AnalysisDiagClients Kind) {
   switch (Kind) {
   default:
-    llvm::llvm_unreachable("Unknown analysis client!");
+    llvm_unreachable("Unknown analysis client!");
 #define ANALYSIS_DIAGNOSTICS(NAME, CMDFLAG, DESC, CREATFN, AUTOCREATE) \
   case PD_##NAME: return CMDFLAG;
 #include "clang/Frontend/Analyses.def"
@@ -246,7 +246,7 @@ static const char *getInputKindName(FrontendOptions::InputKind Kind) {
   case FrontendOptions::IK_PreprocessedObjCXX:return "objective-c++-cpp-output";
   }
 
-  llvm::llvm_unreachable("Unexpected language kind!");
+  llvm_unreachable("Unexpected language kind!");
   return 0;
 }
 
@@ -254,7 +254,7 @@ static const char *getActionName(frontend::ActionKind Kind) {
   switch (Kind) {
   case frontend::PluginAction:
   case frontend::InheritanceView:
-    llvm::llvm_unreachable("Invalid kind!");
+    llvm_unreachable("Invalid kind!");
 
   case frontend::ASTDump:                return "-ast-dump";
   case frontend::ASTPrint:               return "-ast-print";
@@ -284,7 +284,7 @@ static const char *getActionName(frontend::ActionKind Kind) {
   case frontend::RunPreprocessorOnly:    return "-Eonly";
   }
 
-  llvm::llvm_unreachable("Unexpected language kind!");
+  llvm_unreachable("Unexpected language kind!");
   return 0;
 }
 

diff --git a/lib/Frontend/FrontendAction.cpp b/lib/Frontend/FrontendAction.cpp
index e244d3cc21798effd88ad305b8ed5982623c322e..96a68c931e1ff2b844f6bcc6de851cf7c8e8c8cf 100644 (file)
--- a/lib/Frontend/FrontendAction.cpp
+++ b/lib/Frontend/FrontendAction.cpp
@@ -222,5 +222,5 @@ void ASTFrontendAction::ExecuteAction() {
 ASTConsumer *
 PreprocessorFrontendAction::CreateASTConsumer(CompilerInstance &CI,
                                               llvm::StringRef InFile) {
-  llvm::llvm_unreachable("Invalid CreateASTConsumer on preprocessor action!");
+  llvm_unreachable("Invalid CreateASTConsumer on preprocessor action!");
 }

diff --git a/lib/Frontend/LangStandards.cpp b/lib/Frontend/LangStandards.cpp
index 08fd9329f273c45b4cc7e673b099f0826e2b725d..ed0ea1f45ef691cd3c7ea2440ab6c98ba0327682 100644 (file)
--- a/lib/Frontend/LangStandards.cpp
+++ b/lib/Frontend/LangStandards.cpp
@@ -20,7 +20,7 @@ using namespace clang::frontend;
 const LangStandard &LangStandard::getLangStandardForKind(Kind K) {
   switch (K) {
   default:
-    llvm::llvm_unreachable("Invalid language kind!");
+    llvm_unreachable("Invalid language kind!");
   case lang_unspecified:
     llvm::llvm_report_error("getLangStandardForKind() on unspecified kind");
 #define LANGSTANDARD(id, name, desc, features) \

diff --git a/lib/Frontend/PCHReader.cpp b/lib/Frontend/PCHReader.cpp
index 58209c87018ab46ed2b4d8473b7553d0da6efa60..48ef2ac31abab8b295df3cda45db4b43795369e2 100644 (file)
--- a/lib/Frontend/PCHReader.cpp
+++ b/lib/Frontend/PCHReader.cpp
@@ -2207,7 +2207,7 @@ PCHReader::GetTemplateArgumentLocInfo(TemplateArgument::ArgKind Kind,
   case TemplateArgument::Pack:
     return TemplateArgumentLocInfo();
   }
-  llvm::llvm_unreachable("unexpected template argument loc");
+  llvm_unreachable("unexpected template argument loc");
   return TemplateArgumentLocInfo();
 }
 

diff --git a/lib/Parse/DeclSpec.cpp b/lib/Parse/DeclSpec.cpp
index f00f33fcb948d412471e0ab96f90f1545879af3a..4cd8fe887bb1499b03870fb65bc075fb25b9018c 100644 (file)
--- a/lib/Parse/DeclSpec.cpp
+++ b/lib/Parse/DeclSpec.cpp
@@ -137,7 +137,7 @@ const char *DeclSpec::getSpecifierName(DeclSpec::SCS S) {
   case DeclSpec::SCS_private_extern: return "__private_extern__";
   case DeclSpec::SCS_mutable:     return "mutable";
   }
-  llvm::llvm_unreachable("Unknown typespec!");
+  llvm_unreachable("Unknown typespec!");
 }
 
 const char *DeclSpec::getSpecifierName(TSW W) {
@@ -147,7 +147,7 @@ const char *DeclSpec::getSpecifierName(TSW W) {
   case TSW_long:        return "long";
   case TSW_longlong:    return "long long";
   }
-  llvm::llvm_unreachable("Unknown typespec!");
+  llvm_unreachable("Unknown typespec!");
 }
 
 const char *DeclSpec::getSpecifierName(TSC C) {
@@ -156,7 +156,7 @@ const char *DeclSpec::getSpecifierName(TSC C) {
   case TSC_imaginary:   return "imaginary";
   case TSC_complex:     return "complex";
   }
-  llvm::llvm_unreachable("Unknown typespec!");
+  llvm_unreachable("Unknown typespec!");
 }
 
 
@@ -166,7 +166,7 @@ const char *DeclSpec::getSpecifierName(TSS S) {
   case TSS_signed:      return "signed";
   case TSS_unsigned:    return "unsigned";
   }
-  llvm::llvm_unreachable("Unknown typespec!");
+  llvm_unreachable("Unknown typespec!");
 }
 
 const char *DeclSpec::getSpecifierName(DeclSpec::TST T) {
@@ -195,7 +195,7 @@ const char *DeclSpec::getSpecifierName(DeclSpec::TST T) {
   case DeclSpec::TST_decltype:    return "(decltype)";
   case DeclSpec::TST_error:       return "(error)";
   }
-  llvm::llvm_unreachable("Unknown typespec!");
+  llvm_unreachable("Unknown typespec!");
 }
 
 const char *DeclSpec::getSpecifierName(TQ T) {
@@ -205,7 +205,7 @@ const char *DeclSpec::getSpecifierName(TQ T) {
   case DeclSpec::TQ_restrict:    return "restrict";
   case DeclSpec::TQ_volatile:    return "volatile";
   }
-  llvm::llvm_unreachable("Unknown typespec!");
+  llvm_unreachable("Unknown typespec!");
 }
 
 bool DeclSpec::SetStorageClassSpec(SCS S, SourceLocation Loc,

diff --git a/lib/Sema/CodeCompleteConsumer.cpp b/lib/Sema/CodeCompleteConsumer.cpp
index 91b16d3774d4a42e1e2064c33241f0c69be08dfa..d8ed8949cb5d2c0918974f5a8b8447b2fd286735 100644 (file)
--- a/lib/Sema/CodeCompleteConsumer.cpp
+++ b/lib/Sema/CodeCompleteConsumer.cpp
@@ -46,7 +46,7 @@ CodeCompletionString::Chunk::Chunk(ChunkKind Kind, llvm::StringRef Text)
   }
 
   case CK_Optional:
-    llvm::llvm_unreachable("Optional strings cannot be created from text");
+    llvm_unreachable("Optional strings cannot be created from text");
     break;
       
   case CK_LeftParen:

diff --git a/lib/Sema/SemaCodeComplete.cpp b/lib/Sema/SemaCodeComplete.cpp
index 654bf25944a3a229a44ae460ad7ea16f2df1c833..42ac6f19b0e5248820a76e7780efb64717ebf02f 100644 (file)
--- a/lib/Sema/SemaCodeComplete.cpp
+++ b/lib/Sema/SemaCodeComplete.cpp
@@ -1352,7 +1352,7 @@ namespace {
           
         case Result::RK_Keyword:
         case Result::RK_Pattern:
-          llvm::llvm_unreachable("Result kinds handled above");
+          llvm_unreachable("Result kinds handled above");
           break;
       }
       

diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index a1fd79b85235d63421d71959b8a52202556dc72e..db5643898b4e0b68889b68ff270028bb86397269 100644 (file)
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -2913,13 +2913,13 @@ bool InitializationSequence::Diagnose(Sema &S,
         S.Diag(Best->Function->getLocation(), diag::note_unavailable_here)
           << Best->Function->isDeleted();
       } else {
-        llvm::llvm_unreachable("Inconsistent overload resolution?");
+        llvm_unreachable("Inconsistent overload resolution?");
       }
       break;
     }
         
     case OR_Success:
-      llvm::llvm_unreachable("Conversion did not fail!");
+      llvm_unreachable("Conversion did not fail!");
       break;
     }
     break;

diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp
index 7428e941d5896c7719ea9c40acedce12b9c31ec8..724e2fc1e4f586c7c312783233181dbfe7770ed8 100644 (file)
--- a/lib/Sema/SemaLookup.cpp
+++ b/lib/Sema/SemaLookup.cpp
@@ -1167,7 +1167,7 @@ bool Sema::DiagnoseAmbiguousLookup(LookupResult &Result) {
   }
   }
 
-  llvm::llvm_unreachable("unknown ambiguity kind");
+  llvm_unreachable("unknown ambiguity kind");
   return true;
 }
 

diff --git a/lib/Sema/SemaTemplate.cpp b/lib/Sema/SemaTemplate.cpp
index 3ac6bbac5bcc099db22deeeec21d0f257ebb9e5f..9fa57c03eaf75a271f075c1b952a772ea1a94087 100644 (file)
--- a/lib/Sema/SemaTemplate.cpp
+++ b/lib/Sema/SemaTemplate.cpp
@@ -351,7 +351,7 @@ static TemplateArgumentLoc translateTemplateArgument(Sema &SemaRef,
   }
   }
   
-  llvm::llvm_unreachable("Unhandled parsed template argument");
+  llvm_unreachable("Unhandled parsed template argument");
   return TemplateArgumentLoc();
 }
                                                      
@@ -1916,7 +1916,7 @@ bool Sema::CheckTemplateArgument(NamedDecl *Param,
     }
       
     case TemplateArgument::Pack:
-      llvm::llvm_unreachable("Caller must expand template argument packs");
+      llvm_unreachable("Caller must expand template argument packs");
       break;
     }
     
@@ -1969,16 +1969,16 @@ bool Sema::CheckTemplateArgument(NamedDecl *Param,
     return true;
       
   case TemplateArgument::Declaration:
-    llvm::llvm_unreachable(
+    llvm_unreachable(
                        "Declaration argument with template template parameter");
     break;
   case TemplateArgument::Integral:
-    llvm::llvm_unreachable(
+    llvm_unreachable(
                           "Integral argument with template template parameter");
     break;
     
   case TemplateArgument::Pack:
-    llvm::llvm_unreachable("Caller must expand template argument packs");
+    llvm_unreachable("Caller must expand template argument packs");
     break;
   }
   
@@ -4695,7 +4695,7 @@ Sema::CheckTypenameType(NestedNameSpecifier *NNS, const IdentifierInfo &II,
     break;
 
   case LookupResult::FoundUnresolvedValue:
-    llvm::llvm_unreachable("unresolved using decl in non-dependent context");
+    llvm_unreachable("unresolved using decl in non-dependent context");
     return QualType();
 
   case LookupResult::FoundOverloaded:

diff --git a/lib/Sema/SemaType.cpp b/lib/Sema/SemaType.cpp
index c52ac7533282f42ae1ce8ddecd67cf2971abd165..37f19f2be4c6dfce13aedf8b18204c72c96e8db0 100644 (file)
--- a/lib/Sema/SemaType.cpp
+++ b/lib/Sema/SemaType.cpp
@@ -1193,7 +1193,7 @@ QualType Sema::GetTypeForDeclarator(Declarator &D, Scope *S,
 
         case NestedNameSpecifier::Namespace:
         case NestedNameSpecifier::Global:
-          llvm::llvm_unreachable("Nested-name-specifier must name a type");
+          llvm_unreachable("Nested-name-specifier must name a type");
           break;
             
         case NestedNameSpecifier::TypeSpec:
@@ -1360,7 +1360,7 @@ namespace {
     DeclaratorLocFiller(const DeclaratorChunk &Chunk) : Chunk(Chunk) {}
 
     void VisitQualifiedTypeLoc(QualifiedTypeLoc TL) {
-      llvm::llvm_unreachable("qualified type locs not expected here!");
+      llvm_unreachable("qualified type locs not expected here!");
     }
 
     void VisitBlockPointerTypeLoc(BlockPointerTypeLoc TL) {
@@ -1415,7 +1415,7 @@ namespace {
     }
 
     void VisitTypeLoc(TypeLoc TL) {
-      llvm::llvm_unreachable("unsupported TypeLoc kind in declarator!");
+      llvm_unreachable("unsupported TypeLoc kind in declarator!");
     }
   };
 }

diff --git a/lib/Sema/TreeTransform.h b/lib/Sema/TreeTransform.h
index be3c04302e39684ba0688ce48f2e9dc9bad7b023..643489fa374e8032609be3d64c8fdf673236684d 100644 (file)
--- a/lib/Sema/TreeTransform.h
+++ b/lib/Sema/TreeTransform.h
@@ -1871,7 +1871,7 @@ void TreeTransform<Derived>::InventTemplateArgumentLoc(
   SourceLocation Loc = getDerived().getBaseLocation();
   switch (Arg.getKind()) {
   case TemplateArgument::Null:
-    llvm::llvm_unreachable("null template argument in TreeTransform");
+    llvm_unreachable("null template argument in TreeTransform");
     break;
 
   case TemplateArgument::Type:
@@ -2056,7 +2056,7 @@ TreeTransform<Derived>::TransformType(TypeLocBuilder &TLB, TypeLoc T) {
 #include "clang/AST/TypeLocNodes.def"
   }
 
-  llvm::llvm_unreachable("unhandled type loc!");
+  llvm_unreachable("unhandled type loc!");
   return QualType();
 }
 

diff --git a/tools/driver/cc1_main.cpp b/tools/driver/cc1_main.cpp
index 58eef022c7b4d0f60bb483f2557a4b8f6872416d..9c50ccdeba5d7905bba04e94e871959bcd158685 100644 (file)
--- a/tools/driver/cc1_main.cpp
+++ b/tools/driver/cc1_main.cpp
@@ -63,7 +63,7 @@ static FrontendAction *CreateFrontendAction(CompilerInstance &CI) {
 
   switch (CI.getFrontendOpts().ProgramAction) {
   default:
-    llvm::llvm_unreachable("Invalid program action!");
+    llvm_unreachable("Invalid program action!");
 
   case ASTDump:                return new ASTDumpAction();
   case ASTPrint:               return new ASTPrintAction();