Revert "lambda: Experimental support for capture-variable and liberate-variable"

Test fails.

This reverts commit b72123440d8541362ebdb131436f9dbdda5fd329.

Change-Id: Ic9ed92f8c826d8465eb36b746dc44af05caf041c

1 files changed, 3 insertions, 3 deletions

diff --git a/runtime/dex_instruction.cc b/runtime/dex_instruction.cc
index 5250b0d79b..fc4df1475a 100644
--- a/runtime/dex_instruction.cc
+++ b/runtime/dex_instruction.cc
@@ -322,10 +322,10 @@ std::string Instruction::DumpString(const DexFile* file) const {
     }
     case k25x: {
       if (Opcode() == INVOKE_LAMBDA) {
-        uint32_t arg[kMaxVarArgRegs25x];
+        uint32_t arg[kMaxVarArgRegs];
         GetAllArgs25x(arg);
         const size_t num_extra_var_args = VRegB_25x();
-        DCHECK_LE(num_extra_var_args + 2, arraysize(arg));
+        DCHECK_LE(num_extra_var_args + 1, kMaxVarArgRegs);
 
         // invoke-lambda vC, {vD, vE, vF, vG}
         os << opcode << " v" << arg[0] << ", {";
@@ -333,7 +333,7 @@ std::string Instruction::DumpString(const DexFile* file) const {
           if (i != 0) {
             os << ", ";
           }
-          os << "v" << arg[i+2];  // Don't print the pair of vC registers. Pair is implicit.
+          os << "v" << arg[i+1];
         }
         os << "}";
         break;