| Index: src/heap/gc-tracer.h
 | 
| diff --git a/src/heap/gc-tracer.h b/src/heap/gc-tracer.h
 | 
| index f5e557533f29aee58c421d5f097c67254e963c2c..d399d47a9aa0f82f129de73d731033db0cc8cbc3 100644
 | 
| --- a/src/heap/gc-tracer.h
 | 
| +++ b/src/heap/gc-tracer.h
 | 
| @@ -34,67 +34,69 @@ enum ScavengeSpeedMode { kForAllObjects, kForSurvivedObjects };
 | 
|    F(MC_INCREMENTAL_EXTERNAL_EPILOGUE)                              \
 | 
|    F(MC_INCREMENTAL_EXTERNAL_PROLOGUE)
 | 
|  
 | 
| -#define TRACER_SCOPES(F)                      \
 | 
| -  INCREMENTAL_SCOPES(F)                       \
 | 
| -  F(HEAP_EPILOGUE)                            \
 | 
| -  F(HEAP_EPILOGUE_REDUCE_NEW_SPACE)           \
 | 
| -  F(HEAP_EXTERNAL_EPILOGUE)                   \
 | 
| -  F(HEAP_EXTERNAL_PROLOGUE)                   \
 | 
| -  F(HEAP_EXTERNAL_WEAK_GLOBAL_HANDLES)        \
 | 
| -  F(HEAP_PROLOGUE)                            \
 | 
| -  F(MC_CLEAR)                                 \
 | 
| -  F(MC_CLEAR_CODE_FLUSH)                      \
 | 
| -  F(MC_CLEAR_DEPENDENT_CODE)                  \
 | 
| -  F(MC_CLEAR_MAPS)                            \
 | 
| -  F(MC_CLEAR_SLOTS_BUFFER)                    \
 | 
| -  F(MC_CLEAR_STORE_BUFFER)                    \
 | 
| -  F(MC_CLEAR_STRING_TABLE)                    \
 | 
| -  F(MC_CLEAR_WEAK_CELLS)                      \
 | 
| -  F(MC_CLEAR_WEAK_COLLECTIONS)                \
 | 
| -  F(MC_CLEAR_WEAK_LISTS)                      \
 | 
| -  F(MC_EPILOGUE)                              \
 | 
| -  F(MC_EVACUATE)                              \
 | 
| -  F(MC_EVACUATE_CANDIDATES)                   \
 | 
| -  F(MC_EVACUATE_CLEAN_UP)                     \
 | 
| -  F(MC_EVACUATE_COPY)                         \
 | 
| -  F(MC_EVACUATE_EPILOGUE)                     \
 | 
| -  F(MC_EVACUATE_PROLOGUE)                     \
 | 
| -  F(MC_EVACUATE_REBALANCE)                    \
 | 
| -  F(MC_EVACUATE_UPDATE_POINTERS)              \
 | 
| -  F(MC_EVACUATE_UPDATE_POINTERS_TO_EVACUATED) \
 | 
| -  F(MC_EVACUATE_UPDATE_POINTERS_TO_NEW)       \
 | 
| -  F(MC_EVACUATE_UPDATE_POINTERS_WEAK)         \
 | 
| -  F(MC_FINISH)                                \
 | 
| -  F(MC_MARK)                                  \
 | 
| -  F(MC_MARK_FINISH_INCREMENTAL)               \
 | 
| -  F(MC_MARK_PREPARE_CODE_FLUSH)               \
 | 
| -  F(MC_MARK_ROOTS)                            \
 | 
| -  F(MC_MARK_WEAK_CLOSURE)                     \
 | 
| -  F(MC_MARK_WEAK_CLOSURE_EPHEMERAL)           \
 | 
| -  F(MC_MARK_WEAK_CLOSURE_WEAK_HANDLES)        \
 | 
| -  F(MC_MARK_WEAK_CLOSURE_WEAK_ROOTS)          \
 | 
| -  F(MC_MARK_WEAK_CLOSURE_HARMONY)             \
 | 
| -  F(MC_MARK_WRAPPER_EPILOGUE)                 \
 | 
| -  F(MC_MARK_WRAPPER_PROLOGUE)                 \
 | 
| -  F(MC_MARK_WRAPPER_TRACING)                  \
 | 
| -  F(MC_PROLOGUE)                              \
 | 
| -  F(MC_SWEEP)                                 \
 | 
| -  F(MC_SWEEP_CODE)                            \
 | 
| -  F(MC_SWEEP_MAP)                             \
 | 
| -  F(MC_SWEEP_OLD)                             \
 | 
| -  F(MC_MINOR_MC)                              \
 | 
| -  F(MINOR_MC_MARK)                            \
 | 
| -  F(MINOR_MC_MARK_CODE_FLUSH_CANDIDATES)      \
 | 
| -  F(MINOR_MC_MARK_GLOBAL_HANDLES)             \
 | 
| -  F(MINOR_MC_MARK_OLD_TO_NEW_POINTERS)        \
 | 
| -  F(MINOR_MC_MARK_ROOTS)                      \
 | 
| -  F(MINOR_MC_MARK_WEAK)                       \
 | 
| -  F(SCAVENGER_CODE_FLUSH_CANDIDATES)          \
 | 
| -  F(SCAVENGER_EVACUATE)                       \
 | 
| -  F(SCAVENGER_OLD_TO_NEW_POINTERS)            \
 | 
| -  F(SCAVENGER_ROOTS)                          \
 | 
| -  F(SCAVENGER_SCAVENGE)                       \
 | 
| -  F(SCAVENGER_SEMISPACE)                      \
 | 
| +#define TRACER_SCOPES(F)                        \
 | 
| +  INCREMENTAL_SCOPES(F)                         \
 | 
| +  F(HEAP_EPILOGUE)                              \
 | 
| +  F(HEAP_EPILOGUE_REDUCE_NEW_SPACE)             \
 | 
| +  F(HEAP_EXTERNAL_EPILOGUE)                     \
 | 
| +  F(HEAP_EXTERNAL_PROLOGUE)                     \
 | 
| +  F(HEAP_EXTERNAL_WEAK_GLOBAL_HANDLES)          \
 | 
| +  F(HEAP_PROLOGUE)                              \
 | 
| +  F(MC_CLEAR)                                   \
 | 
| +  F(MC_CLEAR_CODE_FLUSH)                        \
 | 
| +  F(MC_CLEAR_DEPENDENT_CODE)                    \
 | 
| +  F(MC_CLEAR_MAPS)                              \
 | 
| +  F(MC_CLEAR_SLOTS_BUFFER)                      \
 | 
| +  F(MC_CLEAR_STORE_BUFFER)                      \
 | 
| +  F(MC_CLEAR_STRING_TABLE)                      \
 | 
| +  F(MC_CLEAR_WEAK_CELLS)                        \
 | 
| +  F(MC_CLEAR_WEAK_COLLECTIONS)                  \
 | 
| +  F(MC_CLEAR_WEAK_LISTS)                        \
 | 
| +  F(MC_EPILOGUE)                                \
 | 
| +  F(MC_EVACUATE)                                \
 | 
| +  F(MC_EVACUATE_CANDIDATES)                     \
 | 
| +  F(MC_EVACUATE_CLEAN_UP)                       \
 | 
| +  F(MC_EVACUATE_COPY)                           \
 | 
| +  F(MC_EVACUATE_EPILOGUE)                       \
 | 
| +  F(MC_EVACUATE_PROLOGUE)                       \
 | 
| +  F(MC_EVACUATE_REBALANCE)                      \
 | 
| +  F(MC_EVACUATE_UPDATE_POINTERS)                \
 | 
| +  F(MC_EVACUATE_UPDATE_POINTERS_TO_EVACUATED)   \
 | 
| +  F(MC_EVACUATE_UPDATE_POINTERS_TO_NEW)         \
 | 
| +  F(MC_EVACUATE_UPDATE_POINTERS_WEAK)           \
 | 
| +  F(MC_FINISH)                                  \
 | 
| +  F(MC_MARK)                                    \
 | 
| +  F(MC_MARK_FINISH_INCREMENTAL)                 \
 | 
| +  F(MC_MARK_PREPARE_CODE_FLUSH)                 \
 | 
| +  F(MC_MARK_ROOTS)                              \
 | 
| +  F(MC_MARK_WEAK_CLOSURE)                       \
 | 
| +  F(MC_MARK_WEAK_CLOSURE_EPHEMERAL)             \
 | 
| +  F(MC_MARK_WEAK_CLOSURE_WEAK_HANDLES)          \
 | 
| +  F(MC_MARK_WEAK_CLOSURE_WEAK_ROOTS)            \
 | 
| +  F(MC_MARK_WEAK_CLOSURE_HARMONY)               \
 | 
| +  F(MC_MARK_WRAPPER_EPILOGUE)                   \
 | 
| +  F(MC_MARK_WRAPPER_PROLOGUE)                   \
 | 
| +  F(MC_MARK_WRAPPER_TRACING)                    \
 | 
| +  F(MC_PROLOGUE)                                \
 | 
| +  F(MC_SWEEP)                                   \
 | 
| +  F(MC_SWEEP_CODE)                              \
 | 
| +  F(MC_SWEEP_MAP)                               \
 | 
| +  F(MC_SWEEP_OLD)                               \
 | 
| +  F(MC_MINOR_MC)                                \
 | 
| +  F(MINOR_MC_CLEAR_LIVENESS)                    \
 | 
| +  F(MINOR_MC_EVACUATE_PROCESS_BLACK_ALLOCATION) \
 | 
| +  F(MINOR_MC_MARK)                              \
 | 
| +  F(MINOR_MC_MARK_CODE_FLUSH_CANDIDATES)        \
 | 
| +  F(MINOR_MC_MARK_GLOBAL_HANDLES)               \
 | 
| +  F(MINOR_MC_MARK_OLD_TO_NEW_POINTERS)          \
 | 
| +  F(MINOR_MC_MARK_ROOTS)                        \
 | 
| +  F(MINOR_MC_MARK_WEAK)                         \
 | 
| +  F(SCAVENGER_CODE_FLUSH_CANDIDATES)            \
 | 
| +  F(SCAVENGER_EVACUATE)                         \
 | 
| +  F(SCAVENGER_OLD_TO_NEW_POINTERS)              \
 | 
| +  F(SCAVENGER_ROOTS)                            \
 | 
| +  F(SCAVENGER_SCAVENGE)                         \
 | 
| +  F(SCAVENGER_SEMISPACE)                        \
 | 
|    F(SCAVENGER_WEAK)
 | 
|  
 | 
|  #define TRACE_GC(tracer, scope_id)                             \
 | 
| 
 |