将远程git仓库的master重置到某一个位置
比如要重置到e3f1e37,
这样就好了。
git checkout mastergit reset --hard e3f1e37git push --force origin master这样就好了。
使__attribute__((annotate("xxx")))能作用于OC函数
diff -Naur orig/llvm-3.7.0.src/tools/clang/lib/CodeGen/CGBlocks.cpp llvm-3.7.0.src/tools/clang/lib/CodeGen/CGBlocks.cpp --- orig/llvm-3.7.0.src/tools /clang/lib/CodeGen/CGBlocks.cpp 2015-06-23 01:07:51.000000000 +0200 +++ llvm-3.7.0.src/tools/clang/lib/CodeGen/CGBlocks.cpp 2015-11-13 13:05:44.000000000 +0100 @@ -1157,6 +1157,10 @@ fnLLVMType, llvm::GlobalValue::InternalLinkage, name, &CGM.getModule()); CGM.SetInternalFunctionAttributes(blockDecl, fn, fnInfo); + // Emit annotation attributes for ObjC blocks. + if (blockDecl->hasAttr<AnnotateAttr>()) + CGM.AddGlobalAnnotations(blockDecl, fn); + // Begin generating the function. StartFunction(blockDecl, fnType->getReturnType(), fn, fnInfo, args, blockDecl->getLocation(), diff -Nau...
评论
发表评论