[llvm-extract] support unnamed bb.

Author: Yilin Li

llvm/tools/llvm-extract/llvm-extract.cpp

@@ -90,10 +90,13 @@ static cl::list<std::string> ExtractBlocks(
         "Each pair will create a function.\n"
         "If multiple basic blocks are specified in one pair,\n"
         "the first block in the sequence should dominate the rest.\n"
+        "If an unnamed basic block is to be extracted,\n"
+        "'%' should be added before the basic block variable names.\n"
         "eg:\n"
         "  --bb=f:bb1;bb2 will extract one function with both bb1 and bb2;\n"
         "  --bb=f:bb1 --bb=f:bb2 will extract two functions, one with bb1, one "
-        "with bb2."),
+        "with bb2.\n"
+        "  --bb=f:%1 will extract one function with basic block 1;"),
     cl::value_desc("function:bb1[;bb2...]"), cl::cat(ExtractCat));
 
 // ExtractAlias - The alias to extract from the module.
@@ -355,9 +358,25 @@ int main(int argc, char **argv) {
       for (StringRef BBName : P.second) {
         // The function has been materialized, so add its matching basic blocks
         // to the block extractor list, or fail if a name is not found.
+#ifndef NDEBUG
         auto Res = llvm::find_if(*P.first, [&](const BasicBlock &BB) {
-          return BB.getName() == BBName;
+          return BB.getNameOrAsOperand() == BBName;
         });
+#else   
+        llvm::Function::iterator Res;
+        if (BBName.substr(0, 1) == "%") {
+          Res = llvm::find_if(*P.first, [&](const BasicBlock &BB) {
+            std::string tmpName;
+            raw_string_ostream OS(tmpName);
+            BB.printAsOperand(OS, false);
+            return OS.str() == BBName;
+          });
+        } else {
+          Res = llvm::find_if(*P.first, [&](const BasicBlock &BB) {
+            return BB.getName() == BBName;
+          });
+        }
+#endif
         if (Res == P.first->end()) {
           errs() << argv[0] << ": function " << P.first->getName()
                  << " doesn't contain a basic block named '" << BBName