[llvm][NFC] AutoUpgrade case 'd'

[urnathan]

Summary

Continuing refactor of the AutoUpgrader, here's a simple update of case 'd':. Consume the dbg. prefix before looking further. Also merge the matched path.

[nikic]

LG

llvm/lib/IR/AutoUpgrade.cpp

case 'c': {
     if (Name.startswith("cttz.") && F->arg_size() == 1) {
       rename(F);
       NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::cttz,
                                         F->arg_begin()->getType());
       return true;
     }
     break;
   }
-  case 'd': {
-    if (Name == "dbg.addr") {
+  case 'd':
+    if (Name.consume_front("dbg.")) {
+      if (Name == "addr" || (Name == "value" && F->arg_size() == 4)) {
         rename(F);
         NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::dbg_value);
         return true;
       }
-    if (Name == "dbg.value" && F->arg_size() == 4) {
-      rename(F);
-      NewFn = Intrinsic::getDeclaration(F->getParent(), Intrinsic::dbg_value);
-      return true;
+      break; // No other 'dbg.*'
     }
     break;
-  }
   case 'e': {
     if (Name.startswith("experimental.vector.extract.")) {
       rename(F);
       Type *Tys[] = {F->getReturnType(), F->arg_begin()->getType()};
       NewFn = Intrinsic::getDeclaration(F->getParent(),
                                         Intrinsic::vector_extract, Tys);
       return true;
     }