Merge "Rename #rs_export_reduce_new to #rs_export_reduce."

3 files changed, 3 insertions, 43 deletions

diff --git a/bcinfo/MetadataExtractor.cpp b/bcinfo/MetadataExtractor.cpp
index 96f3692..95ef57d 100644
--- a/bcinfo/MetadataExtractor.cpp
+++ b/bcinfo/MetadataExtractor.cpp
@@ -153,13 +153,9 @@ static const llvm::StringRef ExportForEachNameMetadataName =
 // (should be synced with slang_rs_metadata.h)
 static const llvm::StringRef ExportForEachMetadataName = "#rs_export_foreach";
 
-// Name of metadata node where exported simple reduce name information resides
-// (should be synced with slang_rs_metadata.h)
-static const llvm::StringRef ExportReduceMetadataName = "#rs_export_reduce";
-
 // Name of metadata node where exported general reduce information resides
 // (should be synced with slang_rs_metadata.h)
-static const llvm::StringRef ExportReduceNewMetadataName = "#rs_export_reduce_new";
+static const llvm::StringRef ExportReduceNewMetadataName = "#rs_export_reduce";
 
 // Name of metadata node where RS object slot info resides (should be
 // synced with slang_rs_metadata.h)
@@ -621,8 +617,6 @@ bool MetadataExtractor::extract() {
       mModule->getNamedMetadata(ExportForEachNameMetadataName);
   const llvm::NamedMDNode *ExportForEachMetadata =
       mModule->getNamedMetadata(ExportForEachMetadataName);
-  const llvm::NamedMDNode *ExportReduceMetadata =
-      mModule->getNamedMetadata(ExportReduceMetadataName);
   const llvm::NamedMDNode *ExportReduceNewMetadata =
       mModule->getNamedMetadata(ExportReduceNewMetadataName);
   const llvm::NamedMDNode *PragmaMetadata =
@@ -648,12 +642,6 @@ bool MetadataExtractor::extract() {
     return false;
   }
 
-  if (!populateNameMetadata(ExportReduceMetadata, mExportReduceNameList,
-                            mExportReduceCount)) {
-    ALOGE("Could not populate export reduce metadata");
-    return false;
-  }
-
   if (!populateForEachMetadata(ExportForEachNameMetadata,
                                ExportForEachMetadata)) {
     ALOGE("Could not populate ForEach signature metadata");
diff --git a/tests/libbcc/test_reduce_general_metadata.ll b/tests/libbcc/test_reduce_general_metadata.ll
index d23854a..b41234a 100644
--- a/tests/libbcc/test_reduce_general_metadata.ll
+++ b/tests/libbcc/test_reduce_general_metadata.ll
@@ -1,4 +1,4 @@
-; Check that the #rs_export_reduce_new node is recognized.
+; Check that the #rs_export_reduce node is recognized.
 
 ; RUN: llvm-rs-as %s -o %t
 ; RUN: bcinfo %t | FileCheck %s
@@ -303,7 +303,7 @@ attributes #1 = { nounwind readonly }
 
 !llvm.ident = !{!0}
 !\23pragma = !{!1, !2}
-!\23rs_export_reduce_new = !{!3, !5, !7, !9, !11, !13, !15, !17}
+!\23rs_export_reduce = !{!3, !5, !7, !9, !11, !13, !15, !17}
 
 !0 = !{!"clang version 3.6 "}
 !1 = !{!"version", !"1"}
diff --git a/tests/libbcc/test_reduce_metadata.ll b/tests/libbcc/test_reduce_metadata.ll
deleted file mode 100644
index aea8f36..0000000
--- a/tests/libbcc/test_reduce_metadata.ll
+++ /dev/null
@@ -1,28 +0,0 @@
-; Check that the #rs_export_reduce node is recognized.
-
-; RUN: llvm-rs-as %s -o %t
-; RUN: bcinfo %t | FileCheck %s
-
-; CHECK: exportReduceCount: 1
-; CHECK: func[0]: add
-
-; ModuleID = 'reduce.bc'
-target datalayout = "e-m:e-i64:64-i128:128-n32:64-S128"
-target triple = "aarch64-none-linux-gnueabi"
-
-; Function Attrs: nounwind readnone
-define i32 @add(i32 %a, i32 %b) #0 {
-  %1 = add nsw i32 %b, %a
-  ret i32 %1
-}
-
-attributes #0 = { nounwind readnone }
-
-!llvm.ident = !{!0}
-!\23pragma = !{!1, !2}
-!\23rs_export_reduce = !{!3}
-
-!0 = !{!"clang version 3.6 "}
-!1 = !{!"version", !"1"}
-!2 = !{!"java_package_name", !"com.android.rs.test"}
-!3 = !{!"add"}