From 6f84984b7b0514227327b2e2c5ef10907d150b96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@innovatetechnologi.es>
Date: Mon, 25 Dec 2017 23:01:00 +0100
Subject: [PATCH] Use attribute [[fallthrough]]

---
 Source/Core/Core/HW/SI/SI_DeviceGBA.cpp             |  4 ++--
 Source/Core/Core/IOS/WFS/WFSI.cpp                   |  2 +-
 .../Core/PowerPC/JitArm64/JitArm64_RegCache.cpp     | 13 +++++--------
 Source/Core/DolphinQt/RenderWidget.cpp              |  2 +-
 4 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp b/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
index 37a1b0f7e9..8d28ed322f 100644
--- a/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
@@ -314,9 +314,9 @@ int CSIDevice_GBA::RunBuffer(u8* buffer, int length)
     m_last_cmd = buffer[0];
     m_timestamp_sent = CoreTiming::GetTicks();
     m_next_action = NextAction::WaitTransferTime;
+    [[fallthrough]];
   }
 
-  // [[fallthrough]]b
   case NextAction::WaitTransferTime:
   {
     int elapsed_time = static_cast<int>(CoreTiming::GetTicks() - m_timestamp_sent);
@@ -324,9 +324,9 @@ int CSIDevice_GBA::RunBuffer(u8* buffer, int length)
     if (GetTransferTime(m_last_cmd) > elapsed_time)
       return 0;
     m_next_action = NextAction::ReceiveResponse;
+    [[fallthrough]];
   }
 
-  // [[fallthrough]]
   case NextAction::ReceiveResponse:
   {
     int num_data_received = m_sock_server.Receive(buffer);
diff --git a/Source/Core/Core/IOS/WFS/WFSI.cpp b/Source/Core/Core/IOS/WFS/WFSI.cpp
index ac18c400c1..0f98bf357f 100644
--- a/Source/Core/Core/IOS/WFS/WFSI.cpp
+++ b/Source/Core/Core/IOS/WFS/WFSI.cpp
@@ -186,7 +186,7 @@ IPCCommandResult WFSI::IOCtl(const IOCtlRequest& request)
 
   case IOCTL_WFSI_PREPARE_PROFILE:
     m_base_extract_path = StringFromFormat("/vol/%s/tmp/", m_device_name.c_str());
-    // Fall through intended.
+    [[fallthrough]];
 
   case IOCTL_WFSI_PREPARE_CONTENT:
   {
diff --git a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp
index b97ac69180..02f557b9b7 100644
--- a/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp
+++ b/Source/Core/Core/PowerPC/JitArm64/JitArm64_RegCache.cpp
@@ -426,8 +426,7 @@ ARM64Reg Arm64FPRCache::R(size_t preg, RegType type)
     // Else convert this register back to doubles.
     m_float_emit->FCVTL(64, EncodeRegToDouble(host_reg), EncodeRegToDouble(host_reg));
     reg.Load(host_reg, REG_REG);
-
-    // fall through
+    [[fallthrough]];
   }
   case REG_REG:  // already in a reg
   {
@@ -442,8 +441,7 @@ ARM64Reg Arm64FPRCache::R(size_t preg, RegType type)
     // Else convert this register back to a double.
     m_float_emit->FCVT(64, 32, EncodeRegToDouble(host_reg), EncodeRegToDouble(host_reg));
     reg.Load(host_reg, REG_LOWER_PAIR);
-
-    // fall through
+    [[fallthrough]];
   }
   case REG_LOWER_PAIR:
   {
@@ -476,8 +474,7 @@ ARM64Reg Arm64FPRCache::R(size_t preg, RegType type)
 
     m_float_emit->FCVT(64, 32, EncodeRegToDouble(host_reg), EncodeRegToDouble(host_reg));
     reg.Load(host_reg, REG_DUP);
-
-    // fall through
+    [[fallthrough]];
   }
   case REG_DUP:
   {
@@ -549,7 +546,7 @@ ARM64Reg Arm64FPRCache::RW(size_t preg, RegType type)
     case REG_REG_SINGLE:
       flush_reg = GetReg();
       m_float_emit->FCVTL(64, EncodeRegToDouble(flush_reg), EncodeRegToDouble(host_reg));
-    // fall through
+      [[fallthrough]];
     case REG_REG:
       // We are doing a full 128bit store because it takes 2 cycles on a Cortex-A57 to do a 128bit
       // store.
@@ -559,7 +556,7 @@ ARM64Reg Arm64FPRCache::RW(size_t preg, RegType type)
     case REG_DUP_SINGLE:
       flush_reg = GetReg();
       m_float_emit->FCVT(64, 32, EncodeRegToDouble(flush_reg), EncodeRegToDouble(host_reg));
-    // fall through
+      [[fallthrough]];
     case REG_DUP:
       // Store PSR1 (which is equal to PSR0) in memory.
       m_float_emit->STR(64, INDEX_UNSIGNED, flush_reg, PPC_REG, PPCSTATE_OFF(ps[preg].ps1));
diff --git a/Source/Core/DolphinQt/RenderWidget.cpp b/Source/Core/DolphinQt/RenderWidget.cpp
index 1d2ffddc0f..668d7fced3 100644
--- a/Source/Core/DolphinQt/RenderWidget.cpp
+++ b/Source/Core/DolphinQt/RenderWidget.cpp
@@ -189,8 +189,8 @@ bool RenderWidget::event(QEvent* event)
   case QEvent::MouseMove:
     if (g_Config.bFreeLook)
       OnFreeLookMouseMove(static_cast<QMouseEvent*>(event));
+    [[fallthrough]];
 
-  // [[fallthrough]]
   case QEvent::MouseButtonPress:
     if (!Settings::Instance().GetHideCursor() && isActiveWindow())
     {