[cleanup] Minor cleanups concerning assemblers and code generation.

src/codegen.cc

Index: src/codegen.cc
diff --git a/src/codegen.cc b/src/codegen.cc
index 11837e97ba838a6c922e550da0425e2f476ad3b6..d43d1f47b442f3d0ff5fbb452592a670a3262e2f 100644
--- a/src/codegen.cc
+++ b/src/codegen.cc
@@ -69,24 +69,20 @@ UNARY_MATH_FUNCTION(sqrt, CreateSqrtFunction)
 #undef UNARY_MATH_FUNCTION
 
 
-#define __ ACCESS_MASM(masm_)
-
 #ifdef DEBUG
 
-Comment::Comment(MacroAssembler* masm, const char* msg)
-    : masm_(masm), msg_(msg) {
-  __ RecordComment(msg);
+Comment::Comment(Assembler* assembler, const char* msg)
+    : assembler_(assembler), msg_(msg) {
+  assembler_->RecordComment(msg);
 }
 
 
 Comment::~Comment() {
-  if (msg_[0] == '[') __ RecordComment("]");
+  if (msg_[0] == '[') assembler_->RecordComment("]");
 }
 
 #endif  // DEBUG
 
-#undef __
-
 
 void CodeGenerator::MakeCodePrologue(CompilationInfo* info, const char* kind) {
   bool print_ast = false;