diff -r e47703369039 -r 743b83bdc12c src/arch/x86/types.hh
--- a/src/arch/x86/types.hh	Fri Jan 20 14:12:58 2017 -0500
+++ b/src/arch/x86/types.hh	Mon Jan 23 14:49:54 2017 +0100
@@ -311,7 +311,8 @@
         bool
         branching() const
         {
-            return this->npc() != this->pc() + size();
+            return (this->npc() != this->pc() + size()) ||
+                   (this->nupc() != this->upc() + 1);
         }
 
         void