aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hines <srhines@google.com>2020-07-27 17:08:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-27 17:08:24 +0000
commit6a23087efbe298f54783bf17e5c996ff9504fa60 (patch)
treebba9a9526803f1ba8f51b43b3f45be30aa0fab63
parent5f94085f67e3985bed838911f546e3e0d720da86 (diff)
parent80bcc7d63ccfcf53b5691afbed154c308b6b15e5 (diff)
downloadlibbcc-6a23087efbe298f54783bf17e5c996ff9504fa60.tar.gz
Merge "Update language to comply with Android’s inclusive language guidance" am: 80bcc7d63c
Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/libbcc/+/1372665 Change-Id: I84567ed8a3cd0f5fef7e53b7c7794ad203ebfafe
-rw-r--r--include/bcc/Compiler.h6
-rw-r--r--lib/RSScriptGroupFusion.cpp2
-rw-r--r--tests/libbcc/test_reduce_general_cleanup.ll2
3 files changed, 5 insertions, 5 deletions
diff --git a/include/bcc/Compiler.h b/include/bcc/Compiler.h
index 708e1b0..715cb2c 100644
--- a/include/bcc/Compiler.h
+++ b/include/bcc/Compiler.h
@@ -109,9 +109,9 @@ public:
~Compiler();
- // Compare undefined external functions in pScript against a 'whitelist' of
- // all RenderScript functions. Returns error if any external function that is
- // not in this whitelist is callable from the script.
+ // Compare undefined external functions in pScript against a list of allowed
+ // RenderScript functions. Returns error if any external function that is
+ // not in this list is callable from the script.
enum ErrorCode screenGlobalFunctions(Script &pScript);
void translateGEPs(Script &pScript);
diff --git a/lib/RSScriptGroupFusion.cpp b/lib/RSScriptGroupFusion.cpp
index 170c2c6..409a5a6 100644
--- a/lib/RSScriptGroupFusion.cpp
+++ b/lib/RSScriptGroupFusion.cpp
@@ -75,7 +75,7 @@ getFunction(Module* mergedModule, const Source* source, const int slot,
return function;
}
-// The whitelist of supported signature bits. Context or user data arguments are
+// The collection of supported signature bits. Context or user data arguments are
// not currently supported in kernel fusion. To support them or any new kinds of
// arguments in the future, it requires not only listing the signature bits here,
// but also implementing additional necessary fusion logic in the getFusedFuncSig(),
diff --git a/tests/libbcc/test_reduce_general_cleanup.ll b/tests/libbcc/test_reduce_general_cleanup.ll
index 214bc5c..9257aea 100644
--- a/tests/libbcc/test_reduce_general_cleanup.ll
+++ b/tests/libbcc/test_reduce_general_cleanup.ll
@@ -1,4 +1,4 @@
-; Check that the unexpanded accumulator functions and the dummy variables are deleted.
+; Check that the unexpanded accumulator functions and the temp variables are deleted.
; There doesn't seem to be any way to compute the basename of %s, hence the unfortunate
; explicit uses of "test_reduce_general_cleanup" below.
; There doesn't seem to be a way to write a CHECK-NOT pattern that matches only at the