diff options
author | 2016-01-19 15:59:16 +0000 | |
---|---|---|
committer | 2016-01-19 15:59:16 +0000 | |
commit | 91d65e024846717fce3572106cffe9b957b8902c (patch) | |
tree | 22ea1a91afdd552a31bb2365a9eae034ae0a1c9b | |
parent | 1bcbcf8e848d18b19d248c3d15f77c888f2b5f04 (diff) |
Fix various typos in ART's comments and string literals.
Change-Id: I85d628055b1a61647a77fef730c9631c234e22a2
-rw-r--r-- | compiler/dex/quick/dex_file_method_inliner.cc | 8 | ||||
-rw-r--r-- | compiler/dwarf/register.h | 2 | ||||
-rw-r--r-- | compiler/elf_writer_debug.cc | 2 | ||||
-rw-r--r-- | compiler/optimizing/parallel_move_resolver.cc | 2 | ||||
-rw-r--r-- | runtime/common_runtime_test.cc | 2 | ||||
-rw-r--r-- | runtime/dex_file.h | 4 | ||||
-rw-r--r-- | runtime/entrypoints/entrypoint_utils-inl.h | 6 | ||||
-rw-r--r-- | runtime/gc/collector/mark_compact.cc | 2 | ||||
-rw-r--r-- | runtime/gc/collector/semi_space.cc | 2 | ||||
-rw-r--r-- | runtime/gc/collector_type.h | 2 | ||||
-rw-r--r-- | runtime/gc/reference_processor.cc | 2 | ||||
-rw-r--r-- | runtime/gc/space/large_object_space.cc | 2 | ||||
-rw-r--r-- | runtime/instrumentation.cc | 2 | ||||
-rw-r--r-- | runtime/intern_table.h | 2 | ||||
-rw-r--r-- | runtime/oat_file.cc | 2 | ||||
-rw-r--r-- | runtime/prebuilt_tools_test.cc | 6 | ||||
-rw-r--r-- | runtime/utf_test.cc | 2 | ||||
-rw-r--r-- | test/137-cfi/cfi.cc | 6 | ||||
-rw-r--r-- | test/141-class-unload/src/Main.java | 6 |
19 files changed, 31 insertions, 31 deletions
diff --git a/compiler/dex/quick/dex_file_method_inliner.cc b/compiler/dex/quick/dex_file_method_inliner.cc index 32d751861a..4617668ee8 100644 --- a/compiler/dex/quick/dex_file_method_inliner.cc +++ b/compiler/dex/quick/dex_file_method_inliner.cc @@ -110,9 +110,9 @@ static_assert(kIntrinsicIsStatic[kIntrinsicAbsLong], "AbsLong must be static"); static_assert(kIntrinsicIsStatic[kIntrinsicAbsFloat], "AbsFloat must be static"); static_assert(kIntrinsicIsStatic[kIntrinsicAbsDouble], "AbsDouble must be static"); static_assert(kIntrinsicIsStatic[kIntrinsicMinMaxInt], "MinMaxInt must be static"); -static_assert(kIntrinsicIsStatic[kIntrinsicMinMaxLong], "MinMaxLong_must_be_static"); -static_assert(kIntrinsicIsStatic[kIntrinsicMinMaxFloat], "MinMaxFloat_must_be_static"); -static_assert(kIntrinsicIsStatic[kIntrinsicMinMaxDouble], "MinMaxDouble_must_be_static"); +static_assert(kIntrinsicIsStatic[kIntrinsicMinMaxLong], "MinMaxLong must be static"); +static_assert(kIntrinsicIsStatic[kIntrinsicMinMaxFloat], "MinMaxFloat must be static"); +static_assert(kIntrinsicIsStatic[kIntrinsicMinMaxDouble], "MinMaxDouble must be static"); static_assert(kIntrinsicIsStatic[kIntrinsicCos], "Cos must be static"); static_assert(kIntrinsicIsStatic[kIntrinsicSin], "Sin must be static"); static_assert(kIntrinsicIsStatic[kIntrinsicAcos], "Acos must be static"); @@ -153,7 +153,7 @@ static_assert(kIntrinsicIsStatic[kIntrinsicCurrentThread], "CurrentThread must b static_assert(kIntrinsicIsStatic[kIntrinsicPeek], "Peek must be static"); static_assert(kIntrinsicIsStatic[kIntrinsicPoke], "Poke must be static"); static_assert(!kIntrinsicIsStatic[kIntrinsicCas], "Cas must not be static"); -static_assert(!kIntrinsicIsStatic[kIntrinsicUnsafeGet], "UnsafeGet_must_not_be_static"); +static_assert(!kIntrinsicIsStatic[kIntrinsicUnsafeGet], "UnsafeGet must not be static"); static_assert(!kIntrinsicIsStatic[kIntrinsicUnsafePut], "UnsafePut must not be static"); static_assert(kIntrinsicIsStatic[kIntrinsicSystemArrayCopyCharArray], "SystemArrayCopyCharArray must be static"); diff --git a/compiler/dwarf/register.h b/compiler/dwarf/register.h index b67e8ddc9d..35b3e15d83 100644 --- a/compiler/dwarf/register.h +++ b/compiler/dwarf/register.h @@ -29,7 +29,7 @@ class Reg { // TODO: Arm S0–S31 register mapping is obsolescent. // We should use VFP-v3/Neon D0-D31 mapping instead. // However, D0 is aliased to pair of S0 and S1, so using that - // mapping we can not easily say S0 is spilled and S1 is not. + // mapping we cannot easily say S0 is spilled and S1 is not. // There are ways around this in DWARF but they are complex. // It would be much simpler to always spill whole D registers. // Arm64 mapping is correct since we already do this there. diff --git a/compiler/elf_writer_debug.cc b/compiler/elf_writer_debug.cc index 3e64762096..e03614f090 100644 --- a/compiler/elf_writer_debug.cc +++ b/compiler/elf_writer_debug.cc @@ -212,7 +212,7 @@ static void WriteCIE(InstructionSet isa, case kNone: break; } - LOG(FATAL) << "Can not write CIE frame for ISA " << isa; + LOG(FATAL) << "Cannot write CIE frame for ISA " << isa; UNREACHABLE(); } diff --git a/compiler/optimizing/parallel_move_resolver.cc b/compiler/optimizing/parallel_move_resolver.cc index 9d136f3ae6..be470ccb7d 100644 --- a/compiler/optimizing/parallel_move_resolver.cc +++ b/compiler/optimizing/parallel_move_resolver.cc @@ -504,7 +504,7 @@ void ParallelMoveResolverNoSwap::PerformMove(size_t index) { void ParallelMoveResolverNoSwap::UpdateMoveSource(Location from, Location to) { // This function is used to reduce the dependencies in the graph after // (from -> to) has been performed. Since we ensure there is no move with the same - // destination, (to -> X) can not be blocked while (from -> X) might still be + // destination, (to -> X) cannot be blocked while (from -> X) might still be // blocked. Consider for example the moves (0 -> 1) (1 -> 2) (1 -> 3). After // (1 -> 2) has been performed, the moves left are (0 -> 1) and (1 -> 3). There is // a dependency between the two. If we update the source location from 1 to 2, we diff --git a/runtime/common_runtime_test.cc b/runtime/common_runtime_test.cc index e89c5af66e..3df9101613 100644 --- a/runtime/common_runtime_test.cc +++ b/runtime/common_runtime_test.cc @@ -232,7 +232,7 @@ static std::string GetAndroidToolsDir(const std::string& subdir1, } if (founddir.empty()) { - ADD_FAILURE() << "Can not find Android tools directory."; + ADD_FAILURE() << "Cannot find Android tools directory."; } return founddir; } diff --git a/runtime/dex_file.h b/runtime/dex_file.h index 8a3db6ccf3..108b8d2441 100644 --- a/runtime/dex_file.h +++ b/runtime/dex_file.h @@ -1094,11 +1094,11 @@ class DexFile { int32_t GetLineNumFromPC(ArtMethod* method, uint32_t rel_pc) const SHARED_REQUIRES(Locks::mutator_lock_); - // Returns false if there is no debugging information or if it can not be decoded. + // Returns false if there is no debugging information or if it cannot be decoded. bool DecodeDebugLocalInfo(const CodeItem* code_item, bool is_static, uint32_t method_idx, DexDebugNewLocalCb local_cb, void* context) const; - // Returns false if there is no debugging information or if it can not be decoded. + // Returns false if there is no debugging information or if it cannot be decoded. bool DecodeDebugPositionInfo(const CodeItem* code_item, DexDebugNewPositionCb position_cb, void* context) const; diff --git a/runtime/entrypoints/entrypoint_utils-inl.h b/runtime/entrypoints/entrypoint_utils-inl.h index 68f2dcbf31..0663b7ef78 100644 --- a/runtime/entrypoints/entrypoint_utils-inl.h +++ b/runtime/entrypoints/entrypoint_utils-inl.h @@ -193,10 +193,10 @@ inline mirror::Object* AllocObjectFromCodeResolved(mirror::Class* klass, return nullptr; } gc::Heap* heap = Runtime::Current()->GetHeap(); - // Pass in false since the object can not be finalizable. + // Pass in false since the object cannot be finalizable. return klass->Alloc<kInstrumented, false>(self, heap->GetCurrentAllocator()); } - // Pass in false since the object can not be finalizable. + // Pass in false since the object cannot be finalizable. return klass->Alloc<kInstrumented, false>(self, allocator_type); } @@ -207,7 +207,7 @@ inline mirror::Object* AllocObjectFromCodeInitialized(mirror::Class* klass, Thread* self, gc::AllocatorType allocator_type) { DCHECK(klass != nullptr); - // Pass in false since the object can not be finalizable. + // Pass in false since the object cannot be finalizable. return klass->Alloc<kInstrumented, false>(self, allocator_type); } diff --git a/runtime/gc/collector/mark_compact.cc b/runtime/gc/collector/mark_compact.cc index ce6467a6cf..7727b2da18 100644 --- a/runtime/gc/collector/mark_compact.cc +++ b/runtime/gc/collector/mark_compact.cc @@ -180,7 +180,7 @@ void MarkCompact::MarkingPhase() { t.NewTiming("ProcessCards"); // Process dirty cards and add dirty cards to mod-union tables. heap_->ProcessCards(GetTimings(), false, false, true); - // Clear the whole card table since we can not Get any additional dirty cards during the + // Clear the whole card table since we cannot get any additional dirty cards during the // paused GC. This saves memory but only works for pause the world collectors. t.NewTiming("ClearCardTable"); heap_->GetCardTable()->ClearCardTable(); diff --git a/runtime/gc/collector/semi_space.cc b/runtime/gc/collector/semi_space.cc index 99e98bb56a..278469329f 100644 --- a/runtime/gc/collector/semi_space.cc +++ b/runtime/gc/collector/semi_space.cc @@ -227,7 +227,7 @@ void SemiSpace::MarkingPhase() { BindBitmaps(); // Process dirty cards and add dirty cards to mod-union tables. heap_->ProcessCards(GetTimings(), kUseRememberedSet && generational_, false, true); - // Clear the whole card table since we can not Get any additional dirty cards during the + // Clear the whole card table since we cannot get any additional dirty cards during the // paused GC. This saves memory but only works for pause the world collectors. t.NewTiming("ClearCardTable"); heap_->GetCardTable()->ClearCardTable(); diff --git a/runtime/gc/collector_type.h b/runtime/gc/collector_type.h index 416510d73b..c8e913c0d4 100644 --- a/runtime/gc/collector_type.h +++ b/runtime/gc/collector_type.h @@ -34,7 +34,7 @@ enum CollectorType { kCollectorTypeSS, // A generational variant of kCollectorTypeSS. kCollectorTypeGSS, - // Mark compact colector. + // Mark compact collector. kCollectorTypeMC, // Heap trimming collector, doesn't do any actual collecting. kCollectorTypeHeapTrim, diff --git a/runtime/gc/reference_processor.cc b/runtime/gc/reference_processor.cc index 39ba7432a1..5e7f1a20fd 100644 --- a/runtime/gc/reference_processor.cc +++ b/runtime/gc/reference_processor.cc @@ -86,7 +86,7 @@ mirror::Object* ReferenceProcessor::GetReferent(Thread* self, mirror::Reference* // it to the mutator as long as the GC is not preserving references. if (LIKELY(collector_ != nullptr)) { // If it's null it means not marked, but it could become marked if the referent is reachable - // by finalizer referents. So we can not return in this case and must block. Otherwise, we + // by finalizer referents. So we cannot return in this case and must block. Otherwise, we // can return it to the mutator as long as the GC is not preserving references, in which // case only black nodes can be safely returned. If the GC is preserving references, the // mutator could take a white field from a grey or white node and move it somewhere else diff --git a/runtime/gc/space/large_object_space.cc b/runtime/gc/space/large_object_space.cc index 2798b21f94..e70fe215ab 100644 --- a/runtime/gc/space/large_object_space.cc +++ b/runtime/gc/space/large_object_space.cc @@ -521,7 +521,7 @@ mirror::Object* FreeListSpace::Alloc(Thread* self, size_t num_bytes, size_t* byt num_bytes_allocated_ += allocation_size; total_bytes_allocated_ += allocation_size; mirror::Object* obj = reinterpret_cast<mirror::Object*>(GetAddressForAllocationInfo(new_info)); - // We always put our object at the start of the free block, there can not be another free block + // We always put our object at the start of the free block, there cannot be another free block // before it. if (kIsDebugBuild) { mprotect(obj, allocation_size, PROT_READ | PROT_WRITE); diff --git a/runtime/instrumentation.cc b/runtime/instrumentation.cc index 7d60264579..7d55e8c20a 100644 --- a/runtime/instrumentation.cc +++ b/runtime/instrumentation.cc @@ -931,7 +931,7 @@ void Instrumentation::InvokeVirtualOrInterfaceImpl(Thread* thread, ArtMethod* caller, uint32_t dex_pc, ArtMethod* callee) const { - // We can not have thread suspension since that would cause the this_object parameter to + // We cannot have thread suspension since that would cause the this_object parameter to // potentially become a dangling pointer. An alternative could be to put it in a handle instead. ScopedAssertNoThreadSuspension ants(thread, __FUNCTION__); for (InstrumentationListener* listener : invoke_virtual_or_interface_listeners_) { diff --git a/runtime/intern_table.h b/runtime/intern_table.h index 8f715a3dc3..2b2176efe1 100644 --- a/runtime/intern_table.h +++ b/runtime/intern_table.h @@ -61,7 +61,7 @@ class InternTable { SHARED_REQUIRES(Locks::mutator_lock_) REQUIRES(!Roles::uninterruptible_); // Only used by image writer. Special version that may not cause thread suspension since the GC - // can not be running while we are doing image writing. Maybe be called while while holding a + // cannot be running while we are doing image writing. Maybe be called while while holding a // lock since there will not be thread suspension. mirror::String* InternStrongImageString(mirror::String* s) SHARED_REQUIRES(Locks::mutator_lock_); diff --git a/runtime/oat_file.cc b/runtime/oat_file.cc index 83e594b169..d2f563be7a 100644 --- a/runtime/oat_file.cc +++ b/runtime/oat_file.cc @@ -627,7 +627,7 @@ void DlOpenOatFile::PreSetup(const std::string& elf_filename) { if (dl_iterate_phdr(dl_iterate_context::callback, &context) == 0) { PrintFileToLog("/proc/self/maps", LogSeverity::WARNING); - LOG(ERROR) << "File " << elf_filename << " loaded with dlopen but can not find its mmaps."; + LOG(ERROR) << "File " << elf_filename << " loaded with dlopen but cannot find its mmaps."; } #endif } diff --git a/runtime/prebuilt_tools_test.cc b/runtime/prebuilt_tools_test.cc index a7f7bcd134..eb226d496a 100644 --- a/runtime/prebuilt_tools_test.cc +++ b/runtime/prebuilt_tools_test.cc @@ -34,7 +34,7 @@ static void CheckToolsExist(const std::string& tools_dir) { struct stat exec_st; std::string exec_path = tools_dir + tool; if (stat(exec_path.c_str(), &exec_st) != 0) { - ADD_FAILURE() << "Can not find " << tool << " in " << tools_dir; + ADD_FAILURE() << "Cannot find " << tool << " in " << tools_dir; } } } @@ -42,7 +42,7 @@ static void CheckToolsExist(const std::string& tools_dir) { TEST_F(PrebuiltToolsTest, CheckHostTools) { std::string tools_dir = GetAndroidHostToolsDir(); if (tools_dir.empty()) { - ADD_FAILURE() << "Can not find Android tools directory for host"; + ADD_FAILURE() << "Cannot find Android tools directory for host"; } else { CheckToolsExist(tools_dir); } @@ -54,7 +54,7 @@ TEST_F(PrebuiltToolsTest, CheckTargetTools) { for (InstructionSet isa : isas) { std::string tools_dir = GetAndroidTargetToolsDir(isa); if (tools_dir.empty()) { - ADD_FAILURE() << "Can not find Android tools directory for " << isa; + ADD_FAILURE() << "Cannot find Android tools directory for " << isa; } else { CheckToolsExist(tools_dir); } diff --git a/runtime/utf_test.cc b/runtime/utf_test.cc index 5239e40540..c67879b427 100644 --- a/runtime/utf_test.cc +++ b/runtime/utf_test.cc @@ -353,7 +353,7 @@ TEST_F(UtfTest, ExhaustiveBidirectionalCodePointCheck) { if (codePoint <= 0xffff) { if (codePoint >= 0xd800 && codePoint <= 0xdfff) { // According to the Unicode standard, no character will ever - // be assigned to these code points, and they can not be encoded + // be assigned to these code points, and they cannot be encoded // into either utf-16 or utf-8. continue; } diff --git a/test/137-cfi/cfi.cc b/test/137-cfi/cfi.cc index 9bfe42922b..77301d20e8 100644 --- a/test/137-cfi/cfi.cc +++ b/test/137-cfi/cfi.cc @@ -76,7 +76,7 @@ static bool CheckStack(Backtrace* bt, const std::vector<std::string>& seq) { } } - printf("Can not find %s in backtrace:\n", seq[cur_search_index].c_str()); + printf("Cannot find %s in backtrace:\n", seq[cur_search_index].c_str()); for (Backtrace::const_iterator it = bt->begin(); it != bt->end(); ++it) { if (BacktraceMap::IsValid(it->map)) { printf(" %s\n", it->func_name.c_str()); @@ -112,7 +112,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_Main_unwindInProcess(JNIEnv*, jobject std::unique_ptr<Backtrace> bt(Backtrace::Create(BACKTRACE_CURRENT_PROCESS, GetTid())); if (!bt->Unwind(0, nullptr)) { - printf("Can not unwind in process.\n"); + printf("Cannot unwind in process.\n"); return JNI_FALSE; } else if (bt->NumFrames() == 0) { printf("No frames for unwind in process.\n"); @@ -205,7 +205,7 @@ extern "C" JNIEXPORT jboolean JNICALL Java_Main_unwindOtherProcess(JNIEnv*, jobj std::unique_ptr<Backtrace> bt(Backtrace::Create(pid, BACKTRACE_CURRENT_THREAD)); bool result = true; if (!bt->Unwind(0, nullptr)) { - printf("Can not unwind other process.\n"); + printf("Cannot unwind other process.\n"); result = false; } else if (bt->NumFrames() == 0) { printf("No frames for unwind of other process.\n"); diff --git a/test/141-class-unload/src/Main.java b/test/141-class-unload/src/Main.java index 0640b364c9..bcb697a396 100644 --- a/test/141-class-unload/src/Main.java +++ b/test/141-class-unload/src/Main.java @@ -79,7 +79,7 @@ public class Main { private static void testUnloadClass(Constructor constructor) throws Exception { WeakReference<Class> klass = setUpUnloadClass(constructor); - // No strong refernces to class loader, should get unloaded. + // No strong references to class loader, should get unloaded. Runtime.getRuntime().gc(); WeakReference<Class> klass2 = setUpUnloadClass(constructor); Runtime.getRuntime().gc(); @@ -91,7 +91,7 @@ public class Main { private static void testUnloadLoader(Constructor constructor) throws Exception { WeakReference<ClassLoader> loader = setUpUnloadLoader(constructor, true); - // No strong refernces to class loader, should get unloaded. + // No strong references to class loader, should get unloaded. Runtime.getRuntime().gc(); // If the weak reference is cleared, then it was unloaded. System.out.println(loader.get()); @@ -109,7 +109,7 @@ public class Main { private static void testLoadAndUnloadLibrary(Constructor constructor) throws Exception { WeakReference<ClassLoader> loader = setUpLoadLibrary(constructor); - // No strong refernces to class loader, should get unloaded. + // No strong references to class loader, should get unloaded. Runtime.getRuntime().gc(); // If the weak reference is cleared, then it was unloaded. System.out.println(loader.get()); |