Small cleanups and linter fixes.

Review URL: https://codereview.chromium.org/2455983002 .

runtime/bin/file_system_watcher_android.cc

@@ -120,7 +120,7 @@ Dart_Handle FileSystemWatcher::ReadEvents(intptr_t id, intptr_t path_id) {
   while (offset < bytes) {
     struct inotify_event* e =
         reinterpret_cast<struct inotify_event*>(buffer + offset);
-    if ((e->mask & IN_IGNORED) == 0) {;
+    if ((e->mask & IN_IGNORED) == 0) {
       Dart_Handle event = Dart_NewList(5);
       int mask = InotifyEventToMask(e);
       Dart_ListSetAt(event, 0, Dart_NewInteger(mask));

runtime/bin/file_system_watcher_linux.cc

@@ -121,7 +121,7 @@ Dart_Handle FileSystemWatcher::ReadEvents(intptr_t id, intptr_t path_id) {
   while (offset < bytes) {
     struct inotify_event* e =
         reinterpret_cast<struct inotify_event*>(buffer + offset);
-    if ((e->mask & IN_IGNORED) == 0) {;
+    if ((e->mask & IN_IGNORED) == 0) {
       Dart_Handle event = Dart_NewList(5);
       int mask = InotifyEventToMask(e);
       Dart_ListSetAt(event, 0, Dart_NewInteger(mask));

runtime/platform/floating_point_win.cc

@@ -5,6 +5,8 @@
 #include "platform/globals.h"
 #if defined(TARGET_OS_WINDOWS)
 
+#include "platform/floating_point_win.h"
+
 #include <limits>  // NOLINT
 
 // Taken from third_party/v8/src/platform-win32.cc

runtime/vm/code_generator.cc

@@ -826,7 +826,7 @@ static RawFunction* ComputeTypeCheckTarget(const Instance& receiver,
                          ? store->simple_instance_of_true_function()
                          : store->simple_instance_of_false_function());
   ASSERT(!target.IsNull());
-  return target.raw();;
+  return target.raw();
 }
 
 

runtime/vm/cpu_arm.cc

@@ -5,8 +5,10 @@
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_ARM)
 
-#include "vm/assembler.h"
 #include "vm/cpu.h"
+#include "vm/cpu_arm.h"
+
+#include "vm/assembler.h"
 #include "vm/cpuinfo.h"
 #include "vm/heap.h"
 #include "vm/isolate.h"

runtime/vm/cpu_ia32.cc

@@ -6,6 +6,7 @@
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/cpu.h"
+#include "vm/cpu_ia32.h"
 
 #include "vm/assembler.h"
 #include "vm/constants_ia32.h"

runtime/vm/cpu_mips.cc

@@ -3,10 +3,11 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
-
 #if defined(TARGET_ARCH_MIPS)
 
 #include "vm/cpu.h"
+#include "vm/cpu_mips.h"
+
 #include "vm/cpuinfo.h"
 #include "vm/simulator.h"
 

runtime/vm/cpu_x64.cc

@@ -3,10 +3,10 @@
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
-
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/cpu.h"
+#include "vm/cpu_x64.h"
 
 #include "vm/assembler.h"
 #include "vm/constants_x64.h"

runtime/vm/instructions_arm.cc

@@ -5,10 +5,12 @@
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_ARM.
 #if defined(TARGET_ARCH_ARM)
 
+#include "vm/instructions.h"
+#include "vm/instructions_arm.h"
+
 #include "vm/assembler.h"
 #include "vm/constants_arm.h"
 #include "vm/cpu.h"
-#include "vm/instructions.h"
 #include "vm/object.h"
 
 namespace dart {

runtime/vm/instructions_arm64.cc

@@ -5,10 +5,12 @@
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_ARM64.
 #if defined(TARGET_ARCH_ARM64)
 
+#include "vm/instructions.h"
+#include "vm/instructions_arm64.h"
+
 #include "vm/assembler.h"
 #include "vm/constants_arm64.h"
 #include "vm/cpu.h"
-#include "vm/instructions.h"
 #include "vm/object.h"
 
 namespace dart {

runtime/vm/instructions_ia32.cc

@@ -5,8 +5,10 @@
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_IA32.
 #if defined(TARGET_ARCH_IA32)
 
-#include "vm/cpu.h"
 #include "vm/instructions.h"
+#include "vm/instructions_ia32.h"
+
+#include "vm/cpu.h"
 #include "vm/object.h"
 
 namespace dart {

runtime/vm/instructions_mips.cc

@@ -5,9 +5,11 @@
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_MIPS.
 #if defined(TARGET_ARCH_MIPS)
 
+#include "vm/instructions.h"
+#include "vm/instructions_mips.h"
+
 #include "vm/constants_mips.h"
 #include "vm/cpu.h"
-#include "vm/instructions.h"
 #include "vm/object.h"
 
 namespace dart {

runtime/vm/instructions_x64.cc

@@ -5,9 +5,11 @@
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
+#include "vm/instructions.h"
+#include "vm/instructions_x64.h"
+
 #include "vm/cpu.h"
 #include "vm/constants_x64.h"
-#include "vm/instructions.h"
 #include "vm/object.h"
 
 namespace dart {

runtime/vm/intermediate_language_arm64.cc

@@ -5130,7 +5130,7 @@ void MergedMathInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
     //    }
     //  }
     Label done;
-    __ CompareRegisters(result_mod, ZR);;
+    __ CompareRegisters(result_mod, ZR);
     __ b(&done, GE);
     // Result is negative, adjust it.
     __ CompareRegisters(right, ZR);

runtime/vm/isolate.cc

@@ -681,7 +681,7 @@ MessageHandler::MessageStatus IsolateMessageHandler::ProcessUnhandledException(
     if (!tmp.IsString()) {
       tmp = String::New(stacktrace.ToCString());
     }
-    stacktrace_str ^= tmp.raw();;
+    stacktrace_str ^= tmp.raw();
   } else {
     exc_str = String::New(result.ToErrorCString());
   }

runtime/vm/isolate_reload_test.cc

@@ -313,7 +313,7 @@ TEST_CASE(IsolateReload_LibraryImportAdded) {
 
   Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(lib);
-  EXPECT_ERROR(SimpleInvokeError(lib, "main"), "max");;
+  EXPECT_ERROR(SimpleInvokeError(lib, "main"), "max");
 
   const char* kReloadScript =
       "import 'dart:math';\n"
@@ -346,7 +346,7 @@ TEST_CASE(IsolateReload_LibraryImportRemoved) {
   lib = TestCase::ReloadTestScript(kReloadScript);
   EXPECT_VALID(lib);
 
-  EXPECT_ERROR(SimpleInvokeError(lib, "main"), "max");;
+  EXPECT_ERROR(SimpleInvokeError(lib, "main"), "max");
 }
 
 

runtime/vm/parser.cc

@@ -9240,7 +9240,7 @@ AstNode* Parser::ParseAwaitForStatement(String* label_name) {
         new(Z) LocalVariable(loop_var_assignment_pos,
                              loop_var_assignment_pos,
                              *loop_var_name,
-                             loop_var_type);;
+                             loop_var_type);
     if (loop_var_is_final) {
       loop_var->set_is_final();
     }
@@ -9479,7 +9479,7 @@ AstNode* Parser::ParseForInStatement(TokenPosition forin_pos,
        new(Z) LocalVariable(loop_var_pos,
                             loop_var_assignment_pos,
                             *loop_var_name,
-                            loop_var_type);;
+                            loop_var_type);
     if (loop_var_is_final) {
       loop_var->set_is_final();
     }

runtime/vm/regexp.cc

@@ -1234,7 +1234,7 @@ static void SplitSearchSpace(ZoneGrowableArray<int>* ranges,
       last - first > kSize * 2 &&
       binary_chop_index > *new_start_index &&
       ranges->At(binary_chop_index) >= first + 2 * kSize) {
-    intptr_t scan_forward_for_section_border = binary_chop_index;;
+    intptr_t scan_forward_for_section_border = binary_chop_index;
     intptr_t new_border = (ranges->At(binary_chop_index) | kMask) + 1;
 
     while (scan_forward_for_section_border < end_index) {

runtime/vm/unibrow.cc

@@ -5,6 +5,8 @@
 // This file was generated at 2014-10-08 15:25:47.940335 (in v8, copied to dart)
 
 #include "vm/unibrow-inl.h"
+#include "vm/unibrow.h"
+
 #include <stdio.h>
 #include <stdlib.h>