Typo fix: instrinsic -> intrinsic

Change-Id: I6116b792d156970cefc277d2ea6af05627917d09

10 files changed, 17 insertions, 17 deletions

diff --git a/TEST_MAPPING b/TEST_MAPPING
index b0646dddb4..29ecd3bfe3 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -506,7 +506,7 @@
       "name": "art-run-test-2268-checker-remove-dead-phis"
     },
     {
-      "name": "art-run-test-2269-checker-constant-folding-instrinsics"
+      "name": "art-run-test-2269-checker-constant-folding-intrinsics"
     },
     {
       "name": "art-run-test-2273-checker-unreachable-intrinsics"
@@ -1976,7 +1976,7 @@
       "name": "art-run-test-2268-checker-remove-dead-phis[com.google.android.art.apex]"
     },
     {
-      "name": "art-run-test-2269-checker-constant-folding-instrinsics[com.google.android.art.apex]"
+      "name": "art-run-test-2269-checker-constant-folding-intrinsics[com.google.android.art.apex]"
     },
     {
       "name": "art-run-test-2273-checker-unreachable-intrinsics[com.google.android.art.apex]"
@@ -3461,7 +3461,7 @@
       "name": "art-run-test-2268-checker-remove-dead-phis"
     },
     {
-      "name": "art-run-test-2269-checker-constant-folding-instrinsics"
+      "name": "art-run-test-2269-checker-constant-folding-intrinsics"
     },
     {
       "name": "art-run-test-2273-checker-unreachable-intrinsics"
@@ -4933,7 +4933,7 @@
       "name": "art-run-test-2268-checker-remove-dead-phis"
     },
     {
-      "name": "art-run-test-2269-checker-constant-folding-instrinsics"
+      "name": "art-run-test-2269-checker-constant-folding-intrinsics"
     },
     {
       "name": "art-run-test-2273-checker-unreachable-intrinsics"
diff --git a/compiler/optimizing/graph_checker.cc b/compiler/optimizing/graph_checker.cc
index db76c04bc0..ad0d0fb2ca 100644
--- a/compiler/optimizing/graph_checker.cc
+++ b/compiler/optimizing/graph_checker.cc
@@ -757,7 +757,7 @@ void GraphChecker::VisitInvoke(HInvoke* invoke) {
     std::stringstream ss;
     ss << invoke->GetIntrinsic();
     AddError(
-        StringPrintf("The graph contains the instrinsic %s which should have been replaced in the "
+        StringPrintf("The graph contains the intrinsic %s which should have been replaced in the "
                      "instruction builder: %s:%d in block %d.",
                      ss.str().c_str(),
                      invoke->DebugName(),
@@ -768,7 +768,7 @@ void GraphChecker::VisitInvoke(HInvoke* invoke) {
 
 void GraphChecker::VisitInvokeStaticOrDirect(HInvokeStaticOrDirect* invoke) {
   // We call VisitInvoke and not VisitInstruction to de-duplicate the common code: always throwing
-  // and instrinsic checks.
+  // and intrinsic checks.
   VisitInvoke(invoke);
 
   if (invoke->IsStaticWithExplicitClinitCheck()) {
diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc
index 7a6c9aaa19..a45d250307 100644
--- a/compiler/optimizing/nodes.cc
+++ b/compiler/optimizing/nodes.cc
@@ -3402,7 +3402,7 @@ std::ostream& operator<<(std::ostream& os, TypeCheckKind rhs) {
 #define CHECK_INTRINSICS_ENUM_VALUES(Name, InvokeType, _, SideEffects, Exceptions, ...) \
   static_assert( \
     static_cast<uint32_t>(Intrinsics::k ## Name) <= (kAccIntrinsicBits >> CTZ(kAccIntrinsicBits)), \
-    "Instrinsics enumeration space overflow.");
+    "Intrinsics enumeration space overflow.");
   ART_INTRINSICS_LIST(CHECK_INTRINSICS_ENUM_VALUES)
 #undef CHECK_INTRINSICS_ENUM_VALUES
 
diff --git a/libdexfile/dex/modifiers.h b/libdexfile/dex/modifiers.h
index e4fc74a3e7..def4ce2b44 100644
--- a/libdexfile/dex/modifiers.h
+++ b/libdexfile/dex/modifiers.h
@@ -111,7 +111,7 @@ static constexpr uint32_t kAccCorePlatformApi =       0x20000000;  // field, met
 // Uses an intrinsic bit but that's OK as intrinsics are always in the boot image.
 static constexpr uint32_t kAccMemorySharedMethod =       0x40000000;
 
-// Set by the compiler driver when compiling boot classes with instrinsic methods.
+// Set by the compiler driver when compiling boot classes with intrinsic methods.
 static constexpr uint32_t kAccIntrinsic  =            0x80000000;  // method (runtime)
 
 // Special runtime-only flags.
diff --git a/runtime/mirror/var_handle.cc b/runtime/mirror/var_handle.cc
index ec332cbcbc..f246e5fd6b 100644
--- a/runtime/mirror/var_handle.cc
+++ b/runtime/mirror/var_handle.cc
@@ -1548,7 +1548,7 @@ VarHandle::AccessMode VarHandle::GetAccessModeByIntrinsic(Intrinsics intrinsic)
     default:
       break;
   }
-  LOG(FATAL) << "Unknown VarHandle instrinsic: " << static_cast<int>(intrinsic);
+  LOG(FATAL) << "Unknown VarHandle intrinsic: " << static_cast<int>(intrinsic);
   UNREACHABLE();
 }
 
diff --git a/test/2269-checker-constant-folding-instrinsics/Android.bp b/test/2269-checker-constant-folding-intrinsics/Android.bp
index 09d7d12797..cc4545f865 100644
--- a/test/2269-checker-constant-folding-instrinsics/Android.bp
+++ b/test/2269-checker-constant-folding-intrinsics/Android.bp
@@ -1,6 +1,6 @@
 // Generated by `regen-test-files`. Do not edit manually.
 
-// Build rules for ART run-test `2269-checker-constant-folding-instrinsics`.
+// Build rules for ART run-test `2269-checker-constant-folding-intrinsics`.
 
 package {
     // See: http://go/android-license-faq
@@ -13,13 +13,13 @@ package {
 
 // Test's Dex code.
 java_test {
-    name: "art-run-test-2269-checker-constant-folding-instrinsics",
+    name: "art-run-test-2269-checker-constant-folding-intrinsics",
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
     data: [
-        ":art-run-test-2269-checker-constant-folding-instrinsics-expected-stdout",
-        ":art-run-test-2269-checker-constant-folding-instrinsics-expected-stderr",
+        ":art-run-test-2269-checker-constant-folding-intrinsics-expected-stdout",
+        ":art-run-test-2269-checker-constant-folding-intrinsics-expected-stderr",
     ],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
@@ -28,16 +28,16 @@ java_test {
 
 // Test's expected standard output.
 genrule {
-    name: "art-run-test-2269-checker-constant-folding-instrinsics-expected-stdout",
-    out: ["art-run-test-2269-checker-constant-folding-instrinsics-expected-stdout.txt"],
+    name: "art-run-test-2269-checker-constant-folding-intrinsics-expected-stdout",
+    out: ["art-run-test-2269-checker-constant-folding-intrinsics-expected-stdout.txt"],
     srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }
 
 // Test's expected standard error.
 genrule {
-    name: "art-run-test-2269-checker-constant-folding-instrinsics-expected-stderr",
-    out: ["art-run-test-2269-checker-constant-folding-instrinsics-expected-stderr.txt"],
+    name: "art-run-test-2269-checker-constant-folding-intrinsics-expected-stderr",
+    out: ["art-run-test-2269-checker-constant-folding-intrinsics-expected-stderr.txt"],
     srcs: ["expected-stderr.txt"],
     cmd: "cp -f $(in) $(out)",
 }
diff --git a/test/2269-checker-constant-folding-instrinsics/expected-stderr.txt b/test/2269-checker-constant-folding-intrinsics/expected-stderr.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2269-checker-constant-folding-instrinsics/expected-stderr.txt
+++ b/test/2269-checker-constant-folding-intrinsics/expected-stderr.txt
diff --git a/test/2269-checker-constant-folding-instrinsics/expected-stdout.txt b/test/2269-checker-constant-folding-intrinsics/expected-stdout.txt
index e69de29bb2..e69de29bb2 100644
--- a/test/2269-checker-constant-folding-instrinsics/expected-stdout.txt
+++ b/test/2269-checker-constant-folding-intrinsics/expected-stdout.txt
diff --git a/test/2269-checker-constant-folding-instrinsics/info.txt b/test/2269-checker-constant-folding-intrinsics/info.txt
index a76788216d..a76788216d 100644
--- a/test/2269-checker-constant-folding-instrinsics/info.txt
+++ b/test/2269-checker-constant-folding-intrinsics/info.txt
diff --git a/test/2269-checker-constant-folding-instrinsics/src/Main.java b/test/2269-checker-constant-folding-intrinsics/src/Main.java
index 0059db88f4..0059db88f4 100644
--- a/test/2269-checker-constant-folding-instrinsics/src/Main.java
+++ b/test/2269-checker-constant-folding-intrinsics/src/Main.java