More inclusive language updates
Based on:
https://source.android.com/setup/contribute/respectful-code
#inclusivefixit
Bug: 161336379
Bug: 161896447
Test: m (comment updates only)
Change-Id: I0e31cebc961f9caf0aa7b48da4b1b86998e42cb5
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index 82f97d6..6386a36 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -1433,7 +1433,6 @@
template<class T> class BuildNativeCallFrameStateMachine {
public:
#if defined(__arm__)
- // TODO: These are all dummy values!
static constexpr bool kNativeSoftFloatAbi = true;
static constexpr size_t kNumNativeGprArgs = 4; // 4 arguments passed in GPRs, r0-r3
static constexpr size_t kNumNativeFprArgs = 0; // 0 arguments passed in FPRs.
@@ -1458,7 +1457,6 @@
static constexpr bool kAlignLongOnStack = false;
static constexpr bool kAlignDoubleOnStack = false;
#elif defined(__i386__)
- // TODO: Check these!
static constexpr bool kNativeSoftFloatAbi = false; // Not using int registers for fp
static constexpr size_t kNumNativeGprArgs = 0; // 0 arguments passed in GPRs.
static constexpr size_t kNumNativeFprArgs = 0; // 0 arguments passed in FPRs.
diff --git a/runtime/jni/jni_internal.cc b/runtime/jni/jni_internal.cc
index 274552a..bf66d4f 100644
--- a/runtime/jni/jni_internal.cc
+++ b/runtime/jni/jni_internal.cc
@@ -2684,7 +2684,7 @@
bool is_copy = array_data != elements;
size_t bytes = array->GetLength() * component_size;
if (is_copy) {
- // Sanity check: If elements is not the same as the java array's data, it better not be a
+ // Integrity check: If elements is not the same as the java array's data, it better not be a
// heap address. TODO: This might be slow to check, may be worth keeping track of which
// copies we make?
if (heap->IsNonDiscontinuousSpaceHeapAddress(elements)) {
diff --git a/runtime/jni/jni_internal_test.cc b/runtime/jni/jni_internal_test.cc
index 02e1ad4..0968b6b 100644
--- a/runtime/jni/jni_internal_test.cc
+++ b/runtime/jni/jni_internal_test.cc
@@ -784,7 +784,7 @@
jclass jlnsme = env_->FindClass("java/lang/NoSuchMethodError");
jclass jncrbc = env_->FindClass("java/nio/channels/ReadableByteChannel");
- // Sanity check that no exceptions are pending.
+ // Check that no exceptions are pending.
ASSERT_FALSE(env_->ExceptionCheck());
// Check that java.lang.Object.foo() doesn't exist and NoSuchMethodError is
@@ -905,7 +905,7 @@
jclass jlobject = env_->FindClass("java/lang/Object");
jclass jlnsme = env_->FindClass("java/lang/NoSuchMethodError");
- // Sanity check that no exceptions are pending
+ // Check that no exceptions are pending
ASSERT_FALSE(env_->ExceptionCheck());
// Check that java.lang.Object.foo() doesn't exist and NoSuchMethodError is
@@ -1035,7 +1035,7 @@
jclass jlnsme = env_->FindClass("java/lang/NoSuchMethodError");
void* native_function = reinterpret_cast<void*>(BogusMethod);
- // Sanity check that no exceptions are pending.
+ // Check that no exceptions are pending.
ASSERT_FALSE(env_->ExceptionCheck());
// The following can print errors to the log we'd like to ignore.