Bug 1218816 - Remove useless semicolons. Found by coccinelle. r=Ehsan
authorSylvestre Ledru <sledru@mozilla.com>
Fri, 22 Jan 2016 16:58:49 +0100
changeset 316448 3b5f43556647710f9f42ec8b09c9c252407d9650
parent 316447 601943e5bee5c529f6d3e154f6aa35dc9288098b
child 316449 4bb2cf3f08475f62b958465b8e62c6ca34e21e4c
push id5703
push userraliiev@mozilla.com
push dateMon, 07 Mar 2016 14:18:41 +0000
treeherdermozilla-beta@31e373ad5b5f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersEhsan
bugs1218816
milestone46.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1218816 - Remove useless semicolons. Found by coccinelle. r=Ehsan
accessible/atk/AccessibleWrap.cpp
accessible/windows/ia2/ia2Accessible.cpp
accessible/windows/msaa/AccessibleWrap.cpp
accessible/xpcom/xpcAccessible.cpp
dom/base/nsGlobalWindow.cpp
dom/base/nsObjectLoadingContent.cpp
dom/cache/DBSchema.cpp
dom/canvas/MurmurHash3.cpp
dom/filesystem/GetDirectoryListingTask.cpp
dom/ipc/ContentChild.cpp
dom/media/ogg/OggCodecState.cpp
dom/media/omx/AudioOffloadPlayer.h
dom/network/TCPServerSocketParent.cpp
dom/plugins/ipc/BrowserStreamParent.cpp
editor/libeditor/nsHTMLEditor.cpp
editor/libeditor/nsTableEditor.cpp
editor/txmgr/nsTransactionStack.cpp
embedding/components/find/nsWebBrowserFind.cpp
extensions/auth/nsAuthGSSAPI.cpp
gfx/thebes/gfxFontEntry.cpp
hal/Hal.cpp
js/src/jit/JitFrames.cpp
js/src/jit/Lowering.cpp
js/src/jit/MCallOptimize.cpp
js/src/jit/mips32/Simulator-mips32.cpp
layout/base/nsPresShell.cpp
layout/base/nsRefreshDriver.cpp
layout/generic/nsSelection.cpp
layout/tables/nsTableFrame.cpp
other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractCallback.cpp
security/manager/ssl/nsNSSCertificate.cpp
security/sandbox/chromium/sandbox/win/src/sandbox_nt_util.cc
toolkit/components/downloads/ApplicationReputation.cpp
toolkit/components/filewatcher/NativeFileWatcherWin.cpp
toolkit/components/telemetry/Telemetry.cpp
toolkit/crashreporter/client/crashreporter.cpp
tools/profiler/tasktracer/GeckoTaskTracer.cpp
widget/GfxInfoBase.cpp
widget/gonk/libdisplay/GonkDisplayJB.cpp
widget/gtk/nsLookAndFeel.cpp
widget/windows/GfxInfo.cpp
widget/windows/InkCollector.cpp
widget/windows/nsWindow.cpp
xpcom/base/nsConsoleService.cpp
xpcom/base/nsDebugImpl.cpp
xpcom/glue/nsStringAPI.cpp
xpcom/io/nsStorageStream.cpp
--- a/accessible/atk/AccessibleWrap.cpp
+++ b/accessible/atk/AccessibleWrap.cpp
@@ -672,17 +672,17 @@ getRoleCB(AtkObject *aAtkObj)
   case roles::geckoRole: \
     aAtkObj->role = atkRole; \
     break;
 
   switch (role) {
 #include "RoleMap.h"
     default:
       MOZ_CRASH("Unknown role.");
-  };
+  }
 
 #undef ROLE
 
   if (aAtkObj->role == ATK_ROLE_LIST_BOX && !IsAtkVersionAtLeast(2, 1))
     aAtkObj->role = ATK_ROLE_LIST;
   else if (aAtkObj->role == ATK_ROLE_TABLE_ROW && !IsAtkVersionAtLeast(2, 1))
     aAtkObj->role = ATK_ROLE_LIST_ITEM;
   else if (aAtkObj->role == ATK_ROLE_MATH && !IsAtkVersionAtLeast(2, 12))
--- a/accessible/windows/ia2/ia2Accessible.cpp
+++ b/accessible/windows/ia2/ia2Accessible.cpp
@@ -246,17 +246,17 @@ ia2Accessible::role(long* aRole)
   if (acc->IsProxy())
     geckoRole = acc->Proxy()->Role();
   else
     geckoRole = acc->Role();
   switch (geckoRole) {
 #include "RoleMap.h"
     default:
       MOZ_CRASH("Unknown role.");
-  };
+  }
 
 #undef ROLE
 
   // Special case, if there is a ROLE_ROW inside of a ROLE_TREE_TABLE, then call
   // the IA2 role a ROLE_OUTLINEITEM.
   if (acc->IsProxy()) {
     if (geckoRole == roles::ROW && acc->Proxy()->Parent() &&
         acc->Proxy()->Parent()->Role() == roles::TREE_TABLE)
--- a/accessible/windows/msaa/AccessibleWrap.cpp
+++ b/accessible/windows/msaa/AccessibleWrap.cpp
@@ -447,17 +447,17 @@ AccessibleWrap::get_accRole(
   case roles::_geckoRole: \
     msaaRole = _msaaRole; \
     break;
 
   switch (geckoRole) {
 #include "RoleMap.h"
     default:
       MOZ_CRASH("Unknown role.");
-  };
+  }
 
 #undef ROLE
 
   // Special case, if there is a ROLE_ROW inside of a ROLE_TREE_TABLE, then call the MSAA role
   // a ROLE_OUTLINEITEM for consistency and compatibility.
   // We need this because ARIA has a role of "row" for both grid and treegrid
   if (xpAccessible->IsProxy()) {
       if (geckoRole == roles::ROW
--- a/accessible/xpcom/xpcAccessible.cpp
+++ b/accessible/xpcom/xpcAccessible.cpp
@@ -341,17 +341,17 @@ xpcAccessible::GetBounds(int32_t* aX, in
 
   if (!Intl())
     return NS_ERROR_FAILURE;
 
   nsIntRect rect = Intl()->Bounds();
   *aX = rect.x;
   *aY = rect.y;
   *aWidth = rect.width;
-  *aHeight = rect.height;;
+  *aHeight = rect.height;
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 xpcAccessible::GroupPosition(int32_t* aGroupLevel,
                              int32_t* aSimilarItemsInGroup,
                              int32_t* aPositionInGroup)
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -11038,17 +11038,17 @@ nsGlobalWindow::Observe(nsISupports* aSu
       NS_ENSURE_SUCCESS(rv, rv);
 
       if (!equals)
         return NS_OK;
 
       fireMozStorageChanged = mLocalStorage == changingStorage;
       if (fireMozStorageChanged) {
         eventType.AssignLiteral("MozLocalStorageChanged");
-      };
+      }
       break;
     }
     default:
       return NS_OK;
     }
 
     // Clone the storage event included in the observer notification. We want
     // to dispatch clones rather than the original event.
--- a/dom/base/nsObjectLoadingContent.cpp
+++ b/dom/base/nsObjectLoadingContent.cpp
@@ -1432,17 +1432,17 @@ nsObjectLoadingContent::ObjectState() co
         case eFallbackOutdated:
         case eFallbackAlternate:
           return NS_EVENT_STATE_BROKEN;
         case eFallbackVulnerableUpdatable:
           return NS_EVENT_STATE_VULNERABLE_UPDATABLE;
         case eFallbackVulnerableNoUpdate:
           return NS_EVENT_STATE_VULNERABLE_NO_UPDATE;
       }
-  };
+  }
   NS_NOTREACHED("unknown type?");
   return NS_EVENT_STATE_LOADING;
 }
 
 // Returns false if mBaseURI is not acceptable for java applets.
 bool
 nsObjectLoadingContent::CheckJavaCodebase()
 {
@@ -2417,17 +2417,17 @@ nsObjectLoadingContent::LoadObject(bool 
       rv = OpenChannel();
       if (NS_FAILED(rv)) {
         LOG(("OBJLC [%p]: OpenChannel returned failure (%u)", this, rv));
       }
     break;
     case eType_Null:
       // Handled below, silence compiler warnings
     break;
-  };
+  }
 
   //
   // Loaded, handle notifications and fallback
   //
   if (NS_FAILED(rv)) {
     // If we failed in the loading hunk above, switch to fallback
     LOG(("OBJLC [%p]: Loading failed, switching to fallback", this));
     mType = eType_Null;
--- a/dom/cache/DBSchema.cpp
+++ b/dom/cache/DBSchema.cpp
@@ -1251,17 +1251,17 @@ MatchByVaryHeader(mozIStorageConnection*
     rv = state->GetUTF8String(0, name);
     if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
     rv = state->GetUTF8String(1, value);
     if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
     ErrorResult errorResult;
 
     cachedHeaders->Append(name, value, errorResult);
-    if (errorResult.Failed()) { return errorResult.StealNSResult(); };
+    if (errorResult.Failed()) { return errorResult.StealNSResult(); }
   }
   if (NS_WARN_IF(NS_FAILED(rv))) { return rv; }
 
   RefPtr<InternalHeaders> queryHeaders =
     TypeUtils::ToInternalHeaders(aRequest.headers());
 
   // Assume the vary headers match until we find a conflict
   bool varyHeadersMatch = true;
--- a/dom/canvas/MurmurHash3.cpp
+++ b/dom/canvas/MurmurHash3.cpp
@@ -135,17 +135,17 @@ void MurmurHash3_x86_32 ( const void * k
   uint32_t k1 = 0;
 
   switch(len & 3)
   {
   case 3: k1 ^= tail[2] << 16;
   case 2: k1 ^= tail[1] << 8;
   case 1: k1 ^= tail[0];
           k1 *= c1; k1 = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
-  };
+  }
 
   //----------
   // finalization
 
   h1 ^= len;
 
   h1 = fmix(h1);
 
@@ -228,17 +228,17 @@ void MurmurHash3_x86_128 ( const void * 
   case  5: k2 ^= tail[ 4] << 0;
            k2 *= c2; k2  = ROTL32(k2,16); k2 *= c3; h2 ^= k2;
 
   case  4: k1 ^= tail[ 3] << 24;
   case  3: k1 ^= tail[ 2] << 16;
   case  2: k1 ^= tail[ 1] << 8;
   case  1: k1 ^= tail[ 0] << 0;
            k1 *= c1; k1  = ROTL32(k1,15); k1 *= c2; h1 ^= k1;
-  };
+  }
 
   //----------
   // finalization
 
   h1 ^= len; h2 ^= len; h3 ^= len; h4 ^= len;
 
   h1 += h2; h1 += h3; h1 += h4;
   h2 += h1; h3 += h1; h4 += h1;
@@ -313,17 +313,17 @@ void MurmurHash3_x64_128 ( const void * 
   case  7: k1 ^= uint64_t(tail[ 6]) << 48;
   case  6: k1 ^= uint64_t(tail[ 5]) << 40;
   case  5: k1 ^= uint64_t(tail[ 4]) << 32;
   case  4: k1 ^= uint64_t(tail[ 3]) << 24;
   case  3: k1 ^= uint64_t(tail[ 2]) << 16;
   case  2: k1 ^= uint64_t(tail[ 1]) << 8;
   case  1: k1 ^= uint64_t(tail[ 0]) << 0;
            k1 *= c1; k1  = ROTL64(k1,31); k1 *= c2; h1 ^= k1;
-  };
+  }
 
   //----------
   // finalization
 
   h1 ^= len; h2 ^= len;
 
   h1 += h2;
   h2 += h1;
--- a/dom/filesystem/GetDirectoryListingTask.cpp
+++ b/dom/filesystem/GetDirectoryListingTask.cpp
@@ -187,17 +187,17 @@ GetDirectoryListingTask::Work()
     nsCOMPtr<nsIFile> currFile = do_QueryInterface(supp);
     MOZ_ASSERT(currFile);
     
     bool isLink, isSpecial, isFile;
     if (NS_WARN_IF(NS_FAILED(currFile->IsSymlink(&isLink)) ||
                    NS_FAILED(currFile->IsSpecial(&isSpecial))) ||
         isLink || isSpecial) {
       continue;
-    };
+    }
     if (NS_WARN_IF(NS_FAILED(currFile->IsFile(&isFile)) ||
                    NS_FAILED(currFile->IsDirectory(&isDir))) ||
         !(isFile || isDir)) {
       continue;
     }
 
     if (filterOutSensitive) {
       bool isHidden;
--- a/dom/ipc/ContentChild.cpp
+++ b/dom/ipc/ContentChild.cpp
@@ -1799,28 +1799,28 @@ ContentChild::SendPMobileConnectionConst
                                                const uint32_t& aClientId)
 {
 #ifdef MOZ_B2G_RIL
   // Add an extra ref for IPDL. Will be released in
   // ContentChild::DeallocPMobileConnectionChild().
   static_cast<MobileConnectionChild*>(aActor)->AddRef();
   return PContentChild::SendPMobileConnectionConstructor(aActor, aClientId);
 #else
-  MOZ_CRASH("No support for mobileconnection on this platform!");;
+  MOZ_CRASH("No support for mobileconnection on this platform!");
 #endif
 }
 
 PMobileConnectionChild*
 ContentChild::AllocPMobileConnectionChild(const uint32_t& aClientId)
 {
 #ifdef MOZ_B2G_RIL
   MOZ_CRASH("No one should be allocating PMobileConnectionChild actors");
   return nullptr;
 #else
-  MOZ_CRASH("No support for mobileconnection on this platform!");;
+  MOZ_CRASH("No support for mobileconnection on this platform!");
 #endif
 }
 
 bool
 ContentChild::DeallocPMobileConnectionChild(PMobileConnectionChild* aActor)
 {
 #ifdef MOZ_B2G_RIL
   // MobileConnectionChild is refcounted, must not be freed manually.
--- a/dom/media/ogg/OggCodecState.cpp
+++ b/dom/media/ogg/OggCodecState.cpp
@@ -1443,17 +1443,17 @@ bool SkeletonState::DecodeFisbone(ogg_pa
       }
       msgProbe += 2;
       msgLength -= 2;
       msgHead = msgProbe;
       continue;
     }
     msgLength--;
     msgProbe++;
-  };
+  }
 
   if (!mMsgFieldStore.Contains(serialno)) {
     mMsgFieldStore.Put(serialno, field.forget());
   } else {
     return false;
   }
 
   return true;
--- a/dom/media/omx/AudioOffloadPlayer.h
+++ b/dom/media/omx/AudioOffloadPlayer.h
@@ -86,17 +86,17 @@ public:
 
   status_t ChangeState(MediaDecoder::PlayState aState) override;
 
   void SetVolume(double aVolume) override;
 
   int64_t GetMediaTimeUs() override;
 
   // To update progress bar when the element is visible
-  void SetElementVisibility(bool aIsVisible) override;;
+  void SetElementVisibility(bool aIsVisible) override;
 
   // Update ready state based on current play state. Not checking data
   // availability since offloading is currently done only when whole compressed
   // data is available
   MediaDecoderOwner::NextFrameStatus GetNextFrameStatus() override;
 
   RefPtr<MediaDecoder::SeekPromise> Seek(SeekTarget aTarget) override;
 
--- a/dom/network/TCPServerSocketParent.cpp
+++ b/dom/network/TCPServerSocketParent.cpp
@@ -67,17 +67,17 @@ TCPServerSocketParent::GetAppId()
 {
   const PContentParent *content = Manager()->Manager();
   if (PBrowserParent* browser = SingleManagedOrNull(content->ManagedPBrowserParent())) {
     TabParent *tab = TabParent::GetFrom(browser);
     return tab->OwnAppId();
   } else {
     return nsIScriptSecurityManager::UNKNOWN_APP_ID;
   }
-};
+}
 
 bool
 TCPServerSocketParent::GetInBrowser()
 {
   const PContentParent *content = Manager()->Manager();
   if (PBrowserParent* browser = SingleManagedOrNull(content->ManagedPBrowserParent())) {
     TabParent *tab = TabParent::GetFrom(browser);
     return tab->IsBrowserElement();
@@ -108,17 +108,17 @@ TCPServerSocketParent::SendCallbackAccep
   }
 
   if (mNeckoParent) {
     if (mNeckoParent->SendPTCPSocketConstructor(socket, host, port)) {
       mozilla::Unused << PTCPServerSocketParent::SendCallbackAccept(socket);
     }
     else {
       NS_ERROR("Sending data from PTCPSocketParent was failed.");
-    };
+    }
   }
   else {
     NS_ERROR("The member value for NeckoParent is wrong.");
   }
   return NS_OK;
 }
 
 bool
--- a/dom/plugins/ipc/BrowserStreamParent.cpp
+++ b/dom/plugins/ipc/BrowserStreamParent.cpp
@@ -130,17 +130,17 @@ BrowserStreamParent::RecvNPN_DestroyStre
     break;
 
   case DYING:
     return true;
 
   default:
     NS_ERROR("Unexpected state");
     return false;
-  };
+  }
 
   mNPP->mNPNIface->destroystream(mNPP->mNPP, mStream, reason);
   return true;
 }
 
 void
 BrowserStreamParent::NPP_DestroyStream(NPReason reason)
 {
--- a/editor/libeditor/nsHTMLEditor.cpp
+++ b/editor/libeditor/nsHTMLEditor.cpp
@@ -1172,17 +1172,17 @@ nsHTMLEditor::CollapseSelectionToDeepest
   for (nsCOMPtr<nsIContent> child = node->GetFirstChild();
        child;
        child = child->GetFirstChild()) {
     // Stop if we find a table, don't want to go into nested tables
     if (nsHTMLEditUtils::IsTable(child) || !IsContainer(child)) {
       break;
     }
     node = child;
-  };
+  }
 
   selection->Collapse(node, 0);
 }
 
 
 /**
  * This is mostly like InsertHTMLWithCharsetAndContext, but we can't use that
  * because it is selection-based and the rules code won't let us edit under the
@@ -2698,17 +2698,17 @@ nsHTMLEditor::SetHTMLBackgroundColor(con
         {
           if (setColor)
             res = SetAttribute(cell, bgcolor, aColor);
           else
             res = RemoveAttribute(cell, bgcolor);
           if (NS_FAILED(res)) break;
 
           GetNextSelectedCell(nullptr, getter_AddRefs(cell));
-        };
+        }
         return res;
       }
     }
     // If we failed to find a cell, fall through to use originally-found element
   } else {
     // No table element -- set the background color on the body tag
     element = do_QueryInterface(GetRoot());
     NS_ENSURE_TRUE(element, NS_ERROR_NULL_POINTER);
--- a/editor/libeditor/nsTableEditor.cpp
+++ b/editor/libeditor/nsTableEditor.cpp
@@ -254,17 +254,17 @@ nsHTMLEditor::GetFirstRow(nsIDOMElement*
     //  or child of a row parent wasn't a row (bad HTML?),
     //  or first child was a textnode
     // Look in next table child
     nsCOMPtr<nsIDOMNode> nextChild;
     res = tableChild->GetNextSibling(getter_AddRefs(nextChild));
     NS_ENSURE_SUCCESS(res, res);
 
     tableChild = nextChild;
-  };
+  }
   // If here, row was not found
   return NS_EDITOR_ELEMENT_NOT_FOUND;
 }
 
 NS_IMETHODIMP
 nsHTMLEditor::GetNextRow(nsIDOMNode* aCurrentRowNode, nsIDOMNode **aRowNode)
 {
   NS_ENSURE_TRUE(aRowNode, NS_ERROR_NULL_POINTER);
@@ -355,17 +355,17 @@ nsHTMLEditor::GetLastCellInRow(nsIDOMNod
   while (rowChild && !nsHTMLEditUtils::IsTableCell(rowChild))
   {
     // Skip over textnodes
     nsCOMPtr<nsIDOMNode> previousChild;
     res = rowChild->GetPreviousSibling(getter_AddRefs(previousChild));
     NS_ENSURE_SUCCESS(res, res);
 
     rowChild = previousChild;
-  };
+  }
   if (rowChild)
   {
     *aCellNode = rowChild.get();
     NS_ADDREF(*aCellNode);
     return NS_OK;
   }
   // If here, cell was not found
   return NS_EDITOR_ELEMENT_NOT_FOUND;
--- a/editor/txmgr/nsTransactionStack.cpp
+++ b/editor/txmgr/nsTransactionStack.cpp
@@ -74,17 +74,17 @@ nsTransactionStack::GetItem(int32_t aInd
   return ret.forget();
 }
 
 void
 nsTransactionStack::Clear()
 {
   while (!mDeque.empty()) {
     RefPtr<nsTransactionItem> tx = mType == FOR_UNDO ? Pop() : PopBottom();
-  };
+  }
 }
 
 void
 nsTransactionStack::DoTraverse(nsCycleCollectionTraversalCallback &cb)
 {
   int32_t size = mDeque.size();
   for (int32_t i = 0; i < size; ++i) {
     nsTransactionItem* item = mDeque[i];
--- a/embedding/components/find/nsWebBrowserFind.cpp
+++ b/embedding/components/find/nsWebBrowserFind.cpp
@@ -181,17 +181,17 @@ nsWebBrowserFind::FindNext(bool* aResult
       }
 
       OnEndSearchFrame(searchFrame);
     }
 
     if (curItem.get() == startingItem.get()) {
       doFind = true; // start looking in frames after this one
     }
-  };
+  }
 
   if (!mWrapFind) {
     // remember where we left off
     SetCurrentSearchFrame(searchFrame);
     return NS_OK;
   }
 
   // From here on, we're wrapping, first through the other frames, then finally
--- a/extensions/auth/nsAuthGSSAPI.cpp
+++ b/extensions/auth/nsAuthGSSAPI.cpp
@@ -139,17 +139,17 @@ gssInit()
             "libgssapi.so"
         };
 
         PRLibSpec libSpec;
         for (size_t i = 0; i < ArrayLength(verLibNames); ++i) {
             libSpec.type = PR_LibSpec_Pathname;
             libSpec.value.pathname = verLibNames[i];
             lib = PR_LoadLibraryWithFlags(libSpec, PR_LD_GLOBAL);
-        };
+        }
 
 #else
         
         const char *const libNames[] = {
             "gss",
             "gssapi_krb5",
             "gssapi"
         };
--- a/gfx/thebes/gfxFontEntry.cpp
+++ b/gfx/thebes/gfxFontEntry.cpp
@@ -1398,17 +1398,17 @@ gfxFontFamily::FindAllFontsForStyle(cons
 }
 
 void
 gfxFontFamily::CheckForSimpleFamily()
 {
     // already checked this family
     if (mIsSimpleFamily) {
         return;
-    };
+    }
 
     uint32_t count = mAvailableFonts.Length();
     if (count > 4 || count == 0) {
         return; // can't be "simple" if there are >4 faces;
                 // if none then the family is unusable anyway
     }
 
     if (count == 1) {
--- a/hal/Hal.cpp
+++ b/hal/Hal.cpp
@@ -1145,17 +1145,17 @@ GetFMBandSettings(FMRadioCountry aCountr
       settings.spaceType() = 50;
       settings.preEmphasis() = 50;
       break;
     case FM_RADIO_COUNTRY_USER_DEFINED:
       break;
     default:
       MOZ_ASSERT(0);
       break;
-    };
+    }
     return settings;
 }
 
 void FactoryReset(mozilla::dom::FactoryResetReason& aReason)
 {
   AssertMainThread();
   PROXY_IF_SANDBOXED(FactoryReset(aReason));
 }
--- a/js/src/jit/JitFrames.cpp
+++ b/js/src/jit/JitFrames.cpp
@@ -1193,17 +1193,17 @@ MarkBailoutFrame(JSTracer* trc, const Ji
     // tracing readable allocations.
     while (true) {
         while (snapIter.moreAllocations())
             snapIter.traceAllocation(trc);
 
         if (!snapIter.moreInstructions())
             break;
         snapIter.nextInstruction();
-    };
+    }
 
 }
 
 void
 UpdateIonJSFrameForMinorGC(JSTracer* trc, const JitFrameIterator& frame)
 {
     // Minor GCs may move slots/elements allocated in the nursery. Update
     // any slots/elements pointers stored in this frame.
--- a/js/src/jit/Lowering.cpp
+++ b/js/src/jit/Lowering.cpp
@@ -4063,17 +4063,17 @@ LIRGenerator::visitSimdUnbox(MSimdUnbox*
       case MIRType_Int32x4:
         kind = Bailout_NonSimdInt32x4Input;
         break;
       case MIRType_Float32x4:
         kind = Bailout_NonSimdFloat32x4Input;
         break;
       default:
         MOZ_CRASH("Unexpected SIMD Type.");
-    };
+    }
 
     LSimdUnbox* lir = new(alloc()) LSimdUnbox(in, temp());
     assignSnapshot(lir, kind);
     define(lir, ins);
 }
 
 void
 LIRGenerator::visitSimdConstant(MSimdConstant* ins)
--- a/js/src/jit/MCallOptimize.cpp
+++ b/js/src/jit/MCallOptimize.cpp
@@ -3322,17 +3322,17 @@ bool
 IonBuilder::canInlineSimd(CallInfo& callInfo, JSNative native, unsigned numArgs,
                             InlineTypedObject** templateObj)
 {
     if (callInfo.argc() != numArgs)
         return false;
 
     JSObject* templateObject = inspector->getTemplateObjectForNative(pc, native);
     if (!templateObject)
-        return false;;
+        return false;
 
     *templateObj = &templateObject->as<InlineTypedObject>();
     return true;
 }
 
 IonBuilder::InliningStatus
 IonBuilder::inlineSimdCheck(CallInfo& callInfo, JSNative native, MIRType mirType)
 {
--- a/js/src/jit/mips32/Simulator-mips32.cpp
+++ b/js/src/jit/mips32/Simulator-mips32.cpp
@@ -276,17 +276,17 @@ SimInstruction::isForbiddenInBranchDelay
           case ff_jalr:
             return true;
           default:
             return false;
         };
         break;
       default:
         return false;
-    };
+    }
 }
 
 bool
 SimInstruction::isLinkingInstruction() const
 {
     const int op = opcodeFieldRaw();
     switch (op) {
       case op_jal:
@@ -441,17 +441,17 @@ SimInstruction::instructionType() const
       case op_sdc1:
         return kImmediateType;
         // 26 bits immediate type instructions. e.g.: j imm26.
       case op_j:
       case op_jal:
         return kJumpType;
       default:
         return kUnsupported;
-    };
+    }
     return kUnsupported;
 }
 
 // C/C++ argument slots size.
 const int kCArgSlotCount = 4;
 const int kCArgsSlotsSize = kCArgSlotCount * SimInstruction::kInstrSize;
 const int kBranchReturnOffset = 2 * SimInstruction::kInstrSize;
 
@@ -2226,17 +2226,17 @@ Simulator::configureTypeRegister(SimInst
           case rs_d:
           case rs_w:
           case rs_l:
           case rs_ps:
             // Do everything in the execution step.
             break;
           default:
             MOZ_CRASH();
-        };
+        }
         break;
       case op_cop1x:
         break;
       case op_special:
         switch (instr->functionFieldRaw()) {
           case ff_jr:
           case ff_jalr:
             next_pc = getRegister(instr->rsValue());
@@ -2362,29 +2362,29 @@ Simulator::configureTypeRegister(SimInst
             // No action taken on decode.
             break;
           case ff_div:
           case ff_divu:
             // div and divu never raise exceptions.
             break;
           default:
             MOZ_CRASH();
-        };
+        }
         break;
       case op_special2:
         switch (instr->functionFieldRaw()) {
           case ff_mul:
             alu_out = rs_u * rt_u;  // Only the lower 32 bits are kept.
             break;
           case ff_clz:
             alu_out = rs_u ? __builtin_clz(rs_u) : 32;
             break;
           default:
             MOZ_CRASH();
-        };
+        }
         break;
       case op_special3:
         switch (instr->functionFieldRaw()) {
           case ff_ins: {   // Mips32r2 instruction.
             // Interpret rd field as 5-bit msb of insert.
             uint16_t msb = rd_reg;
             // Interpret sa field as 5-bit lsb of insert.
             uint16_t lsb = sa;
@@ -2400,21 +2400,21 @@ Simulator::configureTypeRegister(SimInst
             uint16_t lsb = sa;
             uint16_t size = msb + 1;
             uint32_t mask = (1 << size) - 1;
             alu_out = (rs_u & (mask << lsb)) >> lsb;
             break;
           }
           default:
             MOZ_CRASH();
-        };
+        }
         break;
       default:
         MOZ_CRASH();
-    };
+    }
 }
 
 void
 Simulator::decodeTypeRegister(SimInstruction* instr)
 {
     // Instruction fields.
     const Opcode   op     = instr->opcodeFieldRaw();
     const int32_t  rs_reg = instr->rsValue();
@@ -2770,17 +2770,17 @@ Simulator::decodeTypeRegister(SimInstruc
                 setFpuRegisterFloat(fd_reg, static_cast<float>(alu_out));
                 break;
               case ff_cvt_d_fmt:   // Convert word to double.
                 alu_out = getFpuRegister(fs_reg);
                 setFpuRegisterDouble(fd_reg, static_cast<double>(alu_out));
                 break;
               default:
                 MOZ_CRASH();
-            };
+            }
             break;
           case rs_l:
             switch (instr->functionFieldRaw()) {
               case ff_cvt_d_fmt:  // Mips32r2 instruction.
                 // Watch the signs here, we want 2 32-bit vals
                 // to make a sign-64.
                 i64 = static_cast<uint32_t>(getFpuRegister(fs_reg));
                 i64 |= static_cast<int64_t>(getFpuRegister(fs_reg + 1)) << 32;
@@ -2792,17 +2792,17 @@ Simulator::decodeTypeRegister(SimInstruc
               default:
                 MOZ_CRASH();
             }
             break;
           case rs_ps:
             break;
           default:
             MOZ_CRASH();
-        };
+        }
         break;
       case op_cop1x:
         switch (instr->functionFieldRaw()) {
           case ff_madd_s:
             float fr, ft, fs;
             fr = getFpuRegisterFloat(fr_reg);
             fs = getFpuRegisterFloat(fs_reg);
             ft = getFpuRegisterFloat(ft_reg);
@@ -2812,17 +2812,17 @@ Simulator::decodeTypeRegister(SimInstruc
             double dr, dt, ds;
             dr = getFpuRegisterDouble(fr_reg);
             ds = getFpuRegisterDouble(fs_reg);
             dt = getFpuRegisterDouble(ft_reg);
             setFpuRegisterDouble(fd_reg, ds * dt + dr);
             break;
           default:
             MOZ_CRASH();
-        };
+        }
         break;
       case op_special:
         switch (instr->functionFieldRaw()) {
           case ff_jr: {
             SimInstruction* branch_delay_instr = reinterpret_cast<SimInstruction*>(
                     current_pc + SimInstruction::kInstrSize);
             branchDelayInstructionDecode(branch_delay_instr);
             set_pc(next_pc);
@@ -2892,17 +2892,17 @@ Simulator::decodeTypeRegister(SimInstruc
             }
             break;
           }
           case ff_movz:
             if (!rt) setRegister(rd_reg, rs);
             break;
           default:  // For other special opcodes we do the default operation.
             setRegister(rd_reg, alu_out);
-          };
+          }
           break;
       case op_special2:
         switch (instr->functionFieldRaw()) {
           case ff_mul:
             setRegister(rd_reg, alu_out);
             // HI and LO are UNPREDICTABLE after the operation.
             setRegister(LO, Unpredictable);
             setRegister(HI, Unpredictable);
@@ -2918,24 +2918,24 @@ Simulator::decodeTypeRegister(SimInstruc
             setRegister(rt_reg, alu_out);
             break;
           case ff_ext:
             // Ext instr leaves result in Rt, rather than Rd.
             setRegister(rt_reg, alu_out);
             break;
           default:
             MOZ_CRASH();
-        };
+        }
         break;
         // Unimplemented opcodes raised an error in the configuration step before,
         // so we can use the default here to set the destination register in common
         // cases.
       default:
         setRegister(rd_reg, alu_out);
-      };
+      }
 }
 
 // Type 2: instructions using a 16 bytes immediate. (e.g. addi, beq).
 void
 Simulator::decodeTypeImmediate(SimInstruction* instr)
 {
     // Instruction fields.
     Opcode   op     = instr->opcodeFieldRaw();
@@ -2987,17 +2987,17 @@ Simulator::decodeTypeImmediate(SimInstru
             if (do_branch) {
                 next_pc = current_pc + (imm16 << 2) + SimInstruction::kInstrSize;
             } else {
                 next_pc = current_pc + kBranchReturnOffset;
             }
             break;
           default:
             MOZ_CRASH();
-        };
+        }
         break;
         // ------------- op_regimm class.
       case op_regimm:
         switch (instr->rtFieldRaw()) {
           case rt_bltz:
             do_branch = (rs  < 0);
             break;
           case rt_bltzal:
@@ -3006,17 +3006,17 @@ Simulator::decodeTypeImmediate(SimInstru
           case rt_bgez:
             do_branch = rs >= 0;
             break;
           case rt_bgezal:
             do_branch = rs >= 0;
             break;
           default:
             MOZ_CRASH();
-        };
+        }
         switch (instr->rtFieldRaw()) {
           case rt_bltz:
           case rt_bltzal:
           case rt_bgez:
           case rt_bgezal:
             // Branch instructions common part.
             execute_branch_delay_instruction = true;
             // Set next_pc.
@@ -3025,17 +3025,17 @@ Simulator::decodeTypeImmediate(SimInstru
                 if (instr->isLinkingInstruction()) {
                     setRegister(31, current_pc + kBranchReturnOffset);
                 }
             } else {
                 next_pc = current_pc + kBranchReturnOffset;
             }
           default:
             break;
-        };
+        }
         break;  // case op_regimm.
         // ------------- Branch instructions.
         // When comparing to zero, the encoding of rt field is always 0, so we don't
         // need to replace rt with zero.
       case op_beq:
         do_branch = (rs == rt);
         break;
       case op_bne:
@@ -3158,17 +3158,17 @@ Simulator::decodeTypeImmediate(SimInstru
         fp_out = readD(addr, instr);
         break;
       case op_swc1:
       case op_sdc1:
         addr = rs + se_imm16;
         break;
       default:
         MOZ_CRASH();
-    };
+    }
 
     // ---------- Raise exceptions triggered.
     signalExceptions();
 
     // ---------- Execution.
     switch (op) {
           // ------------- Branch instructions.
       case op_beq:
@@ -3234,17 +3234,17 @@ Simulator::decodeTypeImmediate(SimInstru
         writeW(addr, getFpuRegister(ft_reg), instr);
         break;
       case op_sdc1:
         addr = rs + se_imm16;
         writeD(addr, getFpuRegisterDouble(ft_reg), instr);
         break;
       default:
         break;
-    };
+    }
 
 
     if (execute_branch_delay_instruction) {
         // Execute branch delay slot
         // We don't check for end_sim_pc. First it should not be met as the current
         // pc is valid. Secondly a jump should always execute its branch delay slot.
         SimInstruction* branch_delay_instr =
             reinterpret_cast<SimInstruction*>(current_pc + SimInstruction::kInstrSize);
--- a/layout/base/nsPresShell.cpp
+++ b/layout/base/nsPresShell.cpp
@@ -9465,17 +9465,17 @@ CompareTrees(nsPresContext* aFirstPresCo
   //  return true;
   bool ok = true;
   nsIFrame::ChildListIterator lists1(aFirstFrame);
   nsIFrame::ChildListIterator lists2(aSecondFrame);
   do {
     const nsFrameList& kids1 = !lists1.IsDone() ? lists1.CurrentList() : nsFrameList();
     const nsFrameList& kids2 = !lists2.IsDone() ? lists2.CurrentList() : nsFrameList();
     int32_t l1 = kids1.GetLength();
-    int32_t l2 = kids2.GetLength();;
+    int32_t l2 = kids2.GetLength();
     if (l1 != l2) {
       ok = false;
       LogVerifyMessage(kids1.FirstChild(), kids2.FirstChild(),
                        "child counts don't match: ");
       printf("%d != %d\n", l1, l2);
       if (0 == (VERIFY_REFLOW_ALL & gVerifyReflowFlags)) {
         break;
       }
--- a/layout/base/nsRefreshDriver.cpp
+++ b/layout/base/nsRefreshDriver.cpp
@@ -1422,17 +1422,17 @@ static void GetProfileTimelineSubDocShel
     nsDocShell* shell = static_cast<nsDocShell*>(curItem.get());
     bool isVisible = false;
     shell->GetVisibility(&isVisible);
     if (!isVisible) {
       continue;
     }
 
     aShells.AppendElement(shell);
-  };
+  }
 }
 
 static void
 TakeFrameRequestCallbacksFrom(nsIDocument* aDocument,
                               nsTArray<DocumentFrameCallbacks>& aTarget)
 {
   aTarget.AppendElement(aDocument);
   aDocument->TakeFrameRequestCallbacks(aTarget.LastElement().mCallbacks);
--- a/layout/generic/nsSelection.cpp
+++ b/layout/generic/nsSelection.cpp
@@ -2772,24 +2772,24 @@ nsFrameSelection::AddCellsToSelection(ns
       }
       // Done when we reach end column
       if (col == aEndColumnIndex) break;
 
       if (aStartColumnIndex < aEndColumnIndex)
         col ++;
       else
         col--;
-    };
+    }
     if (row == aEndRowIndex) break;
 
     if (aStartRowIndex < aEndRowIndex)
       row++;
     else
       row--;
-  };
+  }
   return result;
 }
 
 nsresult
 nsFrameSelection::RemoveCellsFromSelection(nsIContent *aTable,
                                            int32_t aStartRowIndex,
                                            int32_t aStartColumnIndex,
                                            int32_t aEndRowIndex,
--- a/layout/tables/nsTableFrame.cpp
+++ b/layout/tables/nsTableFrame.cpp
@@ -7525,12 +7525,12 @@ nsTableFrame::InvalidateTableFrame(nsIFr
     // place.
     // XXXbz this doesn't handle outlines, does it?
     aFrame->InvalidateFrame();
     parent->InvalidateFrameWithRect(aOrigVisualOverflow + aOrigRect.TopLeft());
   } else if (aOrigRect.Size() != aFrame->GetSize() ||
              aOrigVisualOverflow.Size() != visualOverflow.Size()){
     aFrame->InvalidateFrameWithRect(aOrigVisualOverflow);
     aFrame->InvalidateFrame();
-    parent->InvalidateFrameWithRect(aOrigRect);;
+    parent->InvalidateFrameWithRect(aOrigRect);
     parent->InvalidateFrame();
   }
 }
--- a/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractCallback.cpp
+++ b/other-licenses/7zstub/src/7zip/Bundles/SFXSetup-moz/ExtractCallback.cpp
@@ -200,17 +200,17 @@ STDMETHODIMP CExtractCallbackImp::GetStr
 STDMETHODIMP CExtractCallbackImp::PrepareOperation(Int32 askExtractMode)
 {
   _extractMode = false;
   switch (askExtractMode)
   {
     case NArchive::NExtract::NAskMode::kExtract:
       _extractMode = true;
       break;
-  };
+  }
   return S_OK;
 }
 
 STDMETHODIMP CExtractCallbackImp::SetOperationResult(Int32 resultEOperationResult)
 {
   switch(resultEOperationResult)
   {
     case NArchive::NExtract::NOperationResult::kOK:
--- a/security/manager/ssl/nsNSSCertificate.cpp
+++ b/security/manager/ssl/nsNSSCertificate.cpp
@@ -1142,17 +1142,17 @@ nsNSSCertificate::ExportAsCMS(uint32_t c
 
   switch (chainMode) {
     case nsIX509Cert::CMS_CHAIN_MODE_CertOnly:
     case nsIX509Cert::CMS_CHAIN_MODE_CertChain:
     case nsIX509Cert::CMS_CHAIN_MODE_CertChainWithRoot:
       break;
     default:
       return NS_ERROR_INVALID_ARG;
-  };
+  }
 
   ScopedNSSCMSMessage cmsg(NSS_CMSMessage_Create(nullptr));
   if (!cmsg) {
     MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
            ("nsNSSCertificate::ExportAsCMS - can't create CMS message\n"));
     return NS_ERROR_OUT_OF_MEMORY;
   }
 
--- a/security/sandbox/chromium/sandbox/win/src/sandbox_nt_util.cc
+++ b/security/sandbox/chromium/sandbox/win/src/sandbox_nt_util.cc
@@ -50,17 +50,17 @@ void* AllocateNearTo(void* source, size_
     } else if (attempts == 40) {
       // Try the highest available address.
       base = NULL;
       type |= MEM_TOP_DOWN;
     }
 
     // Try 100 MB higher.
     base = reinterpret_cast<char*>(base) + 100 * 0x100000;
-  };
+  }
 
   if (attempts == 41)
     return NULL;
 
   ret = g_nt.AllocateVirtualMemory(NtCurrentProcess, &base, zero_bits,
                                    &actual_size, MEM_COMMIT, PAGE_READWRITE);
 
   if (!NT_SUCCESS(ret)) {
--- a/toolkit/components/downloads/ApplicationReputation.cpp
+++ b/toolkit/components/downloads/ApplicationReputation.cpp
@@ -661,17 +661,17 @@ PendingLookup::AddRedirects(nsIArray* aR
 
 nsresult
 PendingLookup::StartLookup()
 {
   mStartTime = TimeStamp::Now();
   nsresult rv = DoLookupInternal();
   if (NS_FAILED(rv)) {
     return OnComplete(false, NS_OK);
-  };
+  }
   return rv;
 }
 
 nsresult
 PendingLookup::GetStrippedSpec(nsIURI* aUri, nsACString& escaped)
 {
   // If aURI is not an nsIURL, we do not want to check the lists or send a
   // remote query.
--- a/toolkit/components/filewatcher/NativeFileWatcherWin.cpp
+++ b/toolkit/components/filewatcher/NativeFileWatcherWin.cpp
@@ -475,17 +475,17 @@ NativeFileWatcherIOTask::RunInternal()
       }
     }
 
     if (!notificationInfo->NextEntryOffset) {
       break;
     }
 
     rawNotificationBuffer += notificationInfo->NextEntryOffset;
-  };
+  }
 
   // We need to keep watching for further changes.
   nsresult rv = AddDirectoryToWatchList(changedRes);
   if (NS_FAILED(rv)) {
     // We failed to watch the folder.
     if (rv == NS_ERROR_ABORT) {
       // Log that we also failed to dispatch the error callbacks.
       FILEWATCHERLOG(
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -2344,17 +2344,17 @@ TelemetryImpl::CreateHistogramSnapshots(
     }
     const uint32_t type = gHistograms[i].histogramType;
     if (type == nsITelemetry::HISTOGRAM_FLAG ||
         type == nsITelemetry::HISTOGRAM_COUNT) {
       Histogram *h;
       DebugOnly<nsresult> rv = GetHistogramByEnumId(Telemetry::ID(i), &h);
       MOZ_ASSERT(NS_SUCCEEDED(rv));
     }
-  };
+  }
 
   StatisticsRecorder::Histograms hs;
   StatisticsRecorder::GetHistograms(&hs);
 
   // We identify corrupt histograms first, rather than interspersing it
   // in the loop below, to ensure that our corruption statistics don't
   // depend on histogram enumeration order.
   //
--- a/toolkit/crashreporter/client/crashreporter.cpp
+++ b/toolkit/crashreporter/client/crashreporter.cpp
@@ -636,17 +636,17 @@ int main(int argc, char** argv)
     paramName << "MOZ_CRASHREPORTER_RESTART_ARG_" << i++;
     const char *param = getenv(paramName.str().c_str());
     while (param && *param) {
       restartArgs.push_back(param);
 
       paramName.str("");
       paramName << "MOZ_CRASHREPORTER_RESTART_ARG_" << i++;
       param = getenv(paramName.str().c_str());
-    };
+    }
 
     // allow override of the server url via environment variable
     //XXX: remove this in the far future when our robot
     // masters force everyone to use XULRunner
     char* urlEnv = getenv("MOZ_CRASHREPORTER_URL");
     if (urlEnv && *urlEnv) {
       sendURL = urlEnv;
     }
--- a/tools/profiler/tasktracer/GeckoTaskTracer.cpp
+++ b/tools/profiler/tasktracer/GeckoTaskTracer.cpp
@@ -134,17 +134,17 @@ CreateSourceEvent(SourceEventType aType)
     namePtr = (uintptr_t*)&CreateSourceEvent##type; \
     break;                              \
   }
 
   switch (aType) {
 #include "SourceEventTypeMap.h"
     default:
       MOZ_CRASH("Unknown SourceEvent.");
-  };
+  }
 #undef CREATE_SOURCE_EVENT_NAME
 
   // Log a fake dispatch and start for this source event.
   LogDispatch(newId, newId, newId, aType);
   LogVirtualTablePtr(newId, newId, namePtr);
   LogBegin(newId, newId);
 }
 
--- a/widget/GfxInfoBase.cpp
+++ b/widget/GfxInfoBase.cpp
@@ -150,17 +150,17 @@ GetPrefNameForFeature(int32_t aFeature)
     case nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION_ENCODE:
       name = BLACKLIST_PREF_BRANCH "webrtc.hw.acceleration.encode";
       break;
     case nsIGfxInfo::FEATURE_WEBRTC_HW_ACCELERATION_DECODE:
       name = BLACKLIST_PREF_BRANCH "webrtc.hw.acceleration.decode";
       break;
     default:
       break;
-  };
+  }
 
   return name;
 }
 
 // Returns the value of the pref for the relevant feature in aValue.
 // If the pref doesn't exist, aValue is not touched, and returns false.
 static bool
 GetPrefValueForFeature(int32_t aFeature, int32_t& aValue)
--- a/widget/gonk/libdisplay/GonkDisplayJB.cpp
+++ b/widget/gonk/libdisplay/GonkDisplayJB.cpp
@@ -393,17 +393,17 @@ GonkDisplayJB::NotifyBootAnimationStoppe
         mBootAnimSTClient = nullptr;
         mBootAnimDispSurface = nullptr;
     }
 }
 
 void
 GonkDisplayJB::PowerOnDisplay(int aDpy)
 {
-    MOZ_ASSERT(mHwc);;
+    MOZ_ASSERT(mHwc);
 #if ANDROID_VERSION >= 21
     if (mHwc->common.version >= HWC_DEVICE_API_VERSION_1_4) {
         mHwc->setPowerMode(mHwc, aDpy, HWC_POWER_MODE_NORMAL);
     } else {
         mHwc->blank(mHwc, aDpy, 0);
     }
 #else
     mHwc->blank(mHwc, aDpy, 0);
--- a/widget/gtk/nsLookAndFeel.cpp
+++ b/widget/gtk/nsLookAndFeel.cpp
@@ -358,17 +358,17 @@ nsLookAndFeel::NativeGetColor(ColorID aI
         break;
     case eColorID__moz_cellhighlighttext:
     case eColorID__moz_html_cellhighlighttext:
         aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_ACTIVE]);
         break;
 #else
     case eColorID_threeddarkshadow:
         // Hardcode to black
-        aColor = NS_RGB(0x00,0x00,0x00);;
+        aColor = NS_RGB(0x00,0x00,0x00);
         break;
 
     case eColorID__moz_eventreerow:
     case eColorID__moz_field:
         aColor = sMozFieldBackground;
         break;
     case eColorID__moz_fieldtext:
         aColor = sMozFieldText;
--- a/widget/windows/GfxInfo.cpp
+++ b/widget/windows/GfxInfo.cpp
@@ -806,17 +806,17 @@ WindowsVersionToOperatingSystem(int32_t 
       return DRIVER_OS_WINDOWS_8;
     case kWindows8_1:
       return DRIVER_OS_WINDOWS_8_1;
     case kWindows10:
       return DRIVER_OS_WINDOWS_10;
     case kWindowsUnknown:
     default:
       return DRIVER_OS_UNKNOWN;
-    };
+    }
 }
 
 const nsTArray<GfxDriverInfo>&
 GfxInfo::GetGfxDriverInfo()
 {
   if (!mDriverInfo->Length()) {
     /*
      * It should be noted here that more specialized rules on certain features
--- a/widget/windows/InkCollector.cpp
+++ b/widget/windows/InkCollector.cpp
@@ -211,17 +211,17 @@ HRESULT InkCollectorEvent::Invoke(DISPID
 {
   switch (aDispIdMember) {
     case DISPID_ICECursorOutOfRange: {
       if (aDispParams && aDispParams->cArgs) {
         CursorOutOfRange(static_cast<IInkCursor*>(aDispParams->rgvarg[0].pdispVal));
       }
       break;
     }
-  };
+  }
   return S_OK;
 }
 
 void InkCollectorEvent::CursorOutOfRange(IInkCursor* aCursor) const
 {
   IInkTablet* curTablet = nullptr;
   if (FAILED(aCursor->get_Tablet(&curTablet))) {
     return;
--- a/widget/windows/nsWindow.cpp
+++ b/widget/windows/nsWindow.cpp
@@ -6301,17 +6301,17 @@ void nsWindow::OnWindowPosChanged(WINDOW
         break;
       case nsSizeMode_Maximized:
           MOZ_LOG(gWindowsLog, LogLevel::Info, 
                  ("*** mSizeMode: nsSizeMode_Maximized\n"));
         break;
       default:
           MOZ_LOG(gWindowsLog, LogLevel::Info, ("*** mSizeMode: ??????\n"));
         break;
-    };
+    }
 #endif
 
     if (mWidgetListener)
       mWidgetListener->SizeModeChanged(mSizeMode);
 
     // If window was restored, window activation was bypassed during the 
     // SetSizeMode call originating from OnWindowPosChanging to avoid saving
     // pre-restore attributes. Force activation now to get correct attributes.
--- a/xpcom/base/nsConsoleService.cpp
+++ b/xpcom/base/nsConsoleService.cpp
@@ -378,17 +378,17 @@ nsConsoleService::GetMessageArray(uint32
     static_cast<nsIConsoleMessage**>(moz_xmalloc(sizeof(nsIConsoleMessage*)
                                                  * mCurrentSize));
 
   uint32_t i = 0;
   for (MessageElement* e = mMessages.getFirst(); e != nullptr; e = e->getNext()) {
     nsCOMPtr<nsIConsoleMessage> m = e->Get();
     m.forget(&messageArray[i]);
     i++;
-  };
+  }
 
   MOZ_ASSERT(i == mCurrentSize);
 
   *aCount = i;
   *aMessages = messageArray;
 
   return NS_OK;
 }
--- a/xpcom/base/nsDebugImpl.cpp
+++ b/xpcom/base/nsDebugImpl.cpp
@@ -319,17 +319,17 @@ NS_DebugBreak(uint32_t aSeverity, const 
       break;
 
     case NS_DEBUG_ABORT:
       sevString = "###!!! ABORT";
       break;
 
     default:
       aSeverity = NS_DEBUG_WARNING;
-  };
+  }
 
 #  define PrintToBuffer(...) PR_sxprintf(StuffFixedBuffer, &buf, __VA_ARGS__)
 
   // Print "[PID]" or "[Desc PID]" at the beginning of the message.
   PrintToBuffer("[");
   if (sMultiprocessDescription) {
     PrintToBuffer("%s ", sMultiprocessDescription);
   }
--- a/xpcom/glue/nsStringAPI.cpp
+++ b/xpcom/glue/nsStringAPI.cpp
@@ -517,17 +517,17 @@ nsAString::AppendInt(int aInt, int32_t a
 
     case 16:
       fmt = "%x";
       break;
 
     default:
       NS_ERROR("Unrecognized radix");
       fmt = "";
-  };
+  }
 
   char buf[20];
   int len = snprintf(buf, sizeof(buf), fmt, aInt);
   buf[sizeof(buf) - 1] = '\0';
 
   Append(NS_ConvertASCIItoUTF16(buf, len));
 }
 
@@ -997,17 +997,17 @@ nsACString::AppendInt(int aInt, int32_t 
 
     case 16:
       fmt = "%x";
       break;
 
     default:
       NS_ERROR("Unrecognized radix");
       fmt = "";
-  };
+  }
 
   char buf[20];
   int len = snprintf(buf, sizeof(buf), fmt, aInt);
   buf[sizeof(buf) - 1] = '\0';
 
   Append(buf, len);
 }
 
--- a/xpcom/io/nsStorageStream.cpp
+++ b/xpcom/io/nsStorageStream.cpp
@@ -194,17 +194,17 @@ nsStorageStream::Write(const char* aBuff
 
     count = XPCOM_MIN(availableInSegment, remaining);
     memcpy(mWriteCursor, readCursor, count);
     remaining -= count;
     readCursor += count;
     mWriteCursor += count;
     LOG(("nsStorageStream [%p] Writing mWriteCursor=%x mSegmentEnd=%x count=%d\n",
          this, mWriteCursor, mSegmentEnd, count));
-  };
+  }
 
 out:
   *aNumWritten = aCount - remaining;
   mLogicalLength += *aNumWritten;
 
   LOG(("nsStorageStream [%p] Wrote mWriteCursor=%x mSegmentEnd=%x numWritten=%d\n",
        this, mWriteCursor, mSegmentEnd, *aNumWritten));
   return rv;
@@ -471,17 +471,17 @@ nsStorageInputStream::ReadSegments(nsWri
     rv = aWriter(this, aClosure, cur + mReadCursor, aCount - remainingCapacity,
                  count, &bytesConsumed);
     if (NS_FAILED(rv) || (bytesConsumed == 0)) {
       break;
     }
     remainingCapacity -= bytesConsumed;
     mReadCursor += bytesConsumed;
     mLogicalCursor += bytesConsumed;
-  };
+  }
 
 out:
   *aNumRead = aCount - remainingCapacity;
 
   bool isWriteInProgress = false;
   if (NS_FAILED(mStorageStream->GetWriteInProgress(&isWriteInProgress))) {
     isWriteInProgress = false;
   }