Merge remote-tracking branch 'origin/4.4'

 Conflicts:
	src/plugins/debugger/debuggerdialogs.cpp
	src/plugins/debugger/gdb/remotegdbserveradapter.cpp

Change-Id: I1ae77869887a8d9ef2a33439f2733315db9e0cf0

2 files changed, 7 insertions, 3 deletions

diff --git a/src/libs/3rdparty/cplusplus/Keywords.cpp b/src/libs/3rdparty/cplusplus/Keywords.cpp
index 522c131e47..9188e6e318 100644
--- a/src/libs/3rdparty/cplusplus/Keywords.cpp
+++ b/src/libs/3rdparty/cplusplus/Keywords.cpp
@@ -255,8 +255,8 @@ static inline int classify5(const char *s, LanguageFeatures features)
       }
     }
   }
-  else if (features.cxxEnabled && s[0] == 'f') {
-    if (s[1] == 'a') {
+  else if (s[0] == 'f') {
+    if (features.cxxEnabled && s[1] == 'a') {
       if (s[2] == 'l') {
         if (s[3] == 's') {
           if (s[4] == 'e') {
diff --git a/src/libs/3rdparty/cplusplus/Symbols.cpp b/src/libs/3rdparty/cplusplus/Symbols.cpp
index 9a84ccacd6..4952469fba 100644
--- a/src/libs/3rdparty/cplusplus/Symbols.cpp
+++ b/src/libs/3rdparty/cplusplus/Symbols.cpp
@@ -106,7 +106,11 @@ Declaration::Declaration(Clone *clone, Subst *subst, Declaration *original)
     , _initializer(clone->stringLiteral(original->_initializer))
 {
     const char* nameId = nullptr;
-    if (const Identifier* identifier = name()->identifier())
+    const Name *theName = name();
+    if (!theName)
+        return;
+
+    if (const Identifier* identifier = theName->identifier())
         nameId = identifier->chars();
     else
         return;