Merge commit '250705a63598' from apple/stable/20190619 into swift/master

Author: git apple-llvm automerger

apple-llvm-config/pr.json

@@ -0,0 +1,9 @@
+{
+"type": "github",
+"domain": "github.com",
+"user": "apple",
+"repo": "llvm-project",
+"test": {
+    "type":"swift-ci"
+}
+}

llvm/tools/dsymutil/DwarfLinker.cpp

@@ -359,11 +359,12 @@ static bool dieNeedsChildrenToBeMeaningful(uint32_t Tag) {
   switch (Tag) {
   default:
     return false;
-  case dwarf::DW_TAG_subprogram:
+  case dwarf::DW_TAG_class_type:
+  case dwarf::DW_TAG_common_block:
   case dwarf::DW_TAG_lexical_block:
-  case dwarf::DW_TAG_subroutine_type:
   case dwarf::DW_TAG_structure_type:
-  case dwarf::DW_TAG_class_type:
+  case dwarf::DW_TAG_subprogram:
+  case dwarf::DW_TAG_subroutine_type:
   case dwarf::DW_TAG_union_type:
     return true;
   }