Mercurial > hg > CbC > CbC_llvm
changeset 15:66597e792247
minor fix
| author | Kaito Tokumori <e105711@ie.u-ryukyu.ac.jp> |
|---|---|
| date | Tue, 17 Sep 2013 21:32:34 +0900 |
| parents | a71c80ca9668 |
| children | d405342cecb1 |
| files | lib/CodeGen/Passes.cpp tools/clang/lib/Parse/ParseDecl.cpp tools/clang/lib/Parse/ParseStmt.cpp |
| diffstat | 3 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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<LangOptions*>(&getLangOpts()); LOP->HasCodeSegment = 1; isInvalid = DS.SetTypeSpecType(DeclSpec::TST___code, Loc, PrevSpec,
--- 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;