diff options
| author | Clay Murphy <claym@google.com> | 2017-03-07 20:42:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-07 20:42:43 +0000 |
| commit | 7bb9b170d68ee38340b816db2d12834a00da91a4 (patch) | |
| tree | 75b73cea2e716f8c0ae19e7ee9e86b0932c2ce09 | |
| parent | 43887a72fd0577cfeea05f66f3276dcedbd6c31c (diff) | |
| parent | bc8835fdc62edb344fa0d0d3f673866b7f26ba6b (diff) | |
| download | source.android.com-7bb9b170d68ee38340b816db2d12834a00da91a4.tar.gz | |
Merge "Minor improvements for invoke-custom"
am: bc8835fdc6
Change-Id: I7d5a3446ce7555fe30d51ff3f717ad64de481a23
| -rw-r--r-- | src/devices/tech/dalvik/dex-format.jd | 4 | ||||
| -rw-r--r-- | src/devices/tech/dalvik/instruction-formats.jd | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/devices/tech/dalvik/dex-format.jd b/src/devices/tech/dalvik/dex-format.jd index 33d96adf..1903f28d 100644 --- a/src/devices/tech/dalvik/dex-format.jd +++ b/src/devices/tech/dalvik/dex-format.jd @@ -1930,7 +1930,7 @@ passed in order and without any type conversions. <li><code>java.lang.invoke.MethodType</code></li> </ol> -<p>And any remaining parameter types correspond to the additional arguments being passed to the bootstrap linker method. +<p>The parameter types of any additional arguments are determined from their constant values. <h3 id="method-handle-item">method_handle_item</h3> <h4>appears in the method_handles section</h4> @@ -1957,7 +1957,7 @@ passed in order and without any type conversions. <td><i>(unused)</i></td> </tr> <tr> - <td>field_or_method_id/td> + <td>field_or_method_id</td> <td>ushort</td> <td>Field or method id depending on whether the method handle type is an accessor or a method invoker</td> </tr> diff --git a/src/devices/tech/dalvik/instruction-formats.jd b/src/devices/tech/dalvik/instruction-formats.jd index 697bc02c..76e61d42 100644 --- a/src/devices/tech/dalvik/instruction-formats.jd +++ b/src/devices/tech/dalvik/instruction-formats.jd @@ -465,7 +465,7 @@ the correspondence.</p> </td> </tr> <tr> - <td>AG|<i>op</i> BBBB F|E|D|C HHHH + <td>A|G|<i>op</i> BBBB F|E|D|C HHHH <td>45cc</td> <td> <i>[<code>A=5</code>] <code>op</code></i> {vC, vD, vE, vF, vG}, meth@BBBB, proto@HHHH<br> |