Revert "ARM64: Use UntagSmi helpers and clean up assertions."

src/arm64/debug-arm64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #if V8_TARGET_ARCH_ARM64
 
 #include "src/codegen.h"
 #include "src/debug.h"
@@ skipping 153 matching lines @@
       // Store each non-object register as two SMIs.
       Register reg = Register(non_object_list.PopLowestIndex());
       __ Lsr(scratch, reg, 32);
       __ SmiTagAndPush(scratch, reg);
 
       // Stack:
       //  jssp[12]: reg[63:32]
       //  jssp[8]: 0x00000000 (SMI tag & padding)
       //  jssp[4]: reg[31:0]
       //  jssp[0]: 0x00000000 (SMI tag & padding)
-      STATIC_ASSERT((kSmiTag == 0) && (kSmiShift == kWRegSizeInBits));
+      STATIC_ASSERT((kSmiTag == 0) && (kSmiShift == 32));
     }
 
     if (object_regs != 0) {
       __ PushXRegList(object_regs);
     }
 
 #ifdef DEBUG
     __ RecordComment("// Calling from debug break to runtime - come in - over");
 #endif
     __ Mov(x0, 0);  // No arguments.
@@ skipping 187 matching lines @@
   // Re-run JSFunction, x1 is function, cp is context.
   __ Br(scratch);
 }
 
 
 const bool LiveEdit::kFrameDropperSupported = true;
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_ARM64