diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2020-07-29 16:25:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-29 16:25:24 +0000 |
| commit | be21ea5151d3a2a5f5e5d61366380dd6385ad3ff (patch) | |
| tree | 6af8715b36d74f6ca4917119d3bea35b77aa058a | |
| parent | 7119b348ace89b8c72bac9678b7fdcf243ca74c9 (diff) | |
| parent | e67697a26016fdb79e4a5ec162f2d7c5c57b5fd2 (diff) | |
| download | dalvik-be21ea5151d3a2a5f5e5d61366380dd6385ad3ff.tar.gz | |
Merge "Inclusive language updates" am: c634c04b70 am: 92442f41e9 am: 93218ed0b5 am: 815be0fe81 am: e67697a260
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1376376
Change-Id: Ieee6141935bb3c21180b8c927256a156dc59fa3e
| -rw-r--r-- | dexgen/src/com/android/dexgen/dex/code/DalvInsnList.java | 2 | ||||
| -rw-r--r-- | docs/debugmon.html | 2 | ||||
| -rw-r--r-- | dx/src/com/android/dx/cf/code/Ropper.java | 2 | ||||
| -rw-r--r-- | dx/src/com/android/dx/dex/code/DalvInsnList.java | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/dexgen/src/com/android/dexgen/dex/code/DalvInsnList.java b/dexgen/src/com/android/dexgen/dex/code/DalvInsnList.java index 15f82c1a3..9ba301bf1 100644 --- a/dexgen/src/com/android/dexgen/dex/code/DalvInsnList.java +++ b/dexgen/src/com/android/dexgen/dex/code/DalvInsnList.java @@ -158,7 +158,7 @@ public final class DalvInsnList extends FixedSizeList { } } - // Sanity check of the amount written. + // Check the amount written. int written = (out.getCursor() - startCursor) / 2; if (written != codeSize()) { throw new RuntimeException("write length mismatch; expected " + diff --git a/docs/debugmon.html b/docs/debugmon.html index 80211456e..3e2eb4d27 100644 --- a/docs/debugmon.html +++ b/docs/debugmon.html @@ -198,7 +198,7 @@ need an "error" chunk type and a handler on the server side.] <p>The same chunk type may have different meanings when sent in different directions. For example, the same type may be used for both a query and -a response to the query. For sanity the type must always be used in +a response to the query. The same type must always be used in related transactions. <p>This is somewhat redundant with the JDWP framing, which includes a diff --git a/dx/src/com/android/dx/cf/code/Ropper.java b/dx/src/com/android/dx/cf/code/Ropper.java index e76110fa8..ec156d608 100644 --- a/dx/src/com/android/dx/cf/code/Ropper.java +++ b/dx/src/com/android/dx/cf/code/Ropper.java @@ -1591,7 +1591,7 @@ public final class Ropper { * should be subroutineSuccessor */ - // Sanity check + // Check we have the expected subroutine. if (subroutine.startBlock != subroutineStart) { throw new RuntimeException ( "ret instruction returns to label " diff --git a/dx/src/com/android/dx/dex/code/DalvInsnList.java b/dx/src/com/android/dx/dex/code/DalvInsnList.java index a83b545fe..d8d4a2292 100644 --- a/dx/src/com/android/dx/dex/code/DalvInsnList.java +++ b/dx/src/com/android/dx/dex/code/DalvInsnList.java @@ -162,7 +162,7 @@ public final class DalvInsnList extends FixedSizeList { } } - // Sanity check of the amount written. + // Check the amount written. int written = (out.getCursor() - startCursor) / 2; if (written != codeSize()) { throw new RuntimeException("write length mismatch; expected " + |