# HG changeset patch # User Kaito Tokumori # Date 1379421154 -32400 # Node ID 66597e7922473e34fdc3e206b52e2293a9234682 # Parent a71c80ca9668942edab61eee3a13ef0820ea5b71 minor fix diff -r a71c80ca9668 -r 66597e792247 lib/CodeGen/Passes.cpp --- a/lib/CodeGen/Passes.cpp Sat Aug 24 14:49:59 2013 +0900 +++ b/lib/CodeGen/Passes.cpp Tue Sep 17 21:32:34 2013 +0900 @@ -416,7 +416,7 @@ /// before exception handling preparation passes. void TargetPassConfig::addCodeGenPrepare() { #ifndef noCbC - if ((getOptLevel() != CodeGenOpt::None || hasCodeSegment()) && !DisableCGP) + if (((getOptLevel() != CodeGenOpt::None) || hasCodeSegment()) && !DisableCGP) #else if (getOptLevel() != CodeGenOpt::None && !DisableCGP) #endif diff -r a71c80ca9668 -r 66597e792247 tools/clang/lib/Parse/ParseDecl.cpp --- a/tools/clang/lib/Parse/ParseDecl.cpp Sat Aug 24 14:49:59 2013 +0900 +++ b/tools/clang/lib/Parse/ParseDecl.cpp Tue Sep 17 21:32:34 2013 +0900 @@ -2877,8 +2877,6 @@ #ifndef noCbC case tok::kw___code: { LangOptions* LOP; - // LangOptions LOC; - // LOC = getLangOpts(); LOP = const_cast(&getLangOpts()); LOP->HasCodeSegment = 1; isInvalid = DS.SetTypeSpecType(DeclSpec::TST___code, Loc, PrevSpec, diff -r a71c80ca9668 -r 66597e792247 tools/clang/lib/Parse/ParseStmt.cpp --- a/tools/clang/lib/Parse/ParseStmt.cpp Sat Aug 24 14:49:59 2013 +0900 +++ b/tools/clang/lib/Parse/ParseStmt.cpp Tue Sep 17 21:32:34 2013 +0900 @@ -1659,7 +1659,7 @@ gotoRes = ParseExprStatement(); - // don't need return because it's not code segment to code segment jump. + // don't need return because this code segment caller isn't code segment. if (!Actions.getCurFunctionDecl()->getResultType().getTypePtr()->isVoidType()) return gotoRes;