Merge remote-tracking branch 'origin/stable/chromium' into feature/patrick/chromium2master

reorder_defs.ml

@@ -87,7 +87,8 @@ let kind_of_glob = function
      | Tenum _ -> Enum
      | _ -> Other)
   (* TODO: find dependencies also in GLOBANNOT... *)
-  | GLOBASM _ | PRAGMA _ | LINKAGE _ | GLOBANNOT _ | CUSTOM _ -> Other
+  | GLOBASM _ | PRAGMA _ | STATIC_ASSERT _
+  | LINKAGE _ | GLOBANNOT _ | CUSTOM _ -> Other
 
 let name_of_glob d = match d with
   | FUNDEF(_,(_,(name,_,_,_)),_,_,_) -> name
@@ -108,7 +109,8 @@ let name_of_glob d = match d with
        Frama_Clang_option.fatal "Unknown type declaration: %a"
          Cabs_debug.pp_def d
     )
-  | GLOBASM _ | PRAGMA _ | LINKAGE _ | GLOBANNOT _ | CUSTOM _ -> ""
+  | GLOBASM _ | PRAGMA _ | STATIC_ASSERT _
+  | LINKAGE _ | GLOBANNOT _ | CUSTOM _ -> ""
 
 let has_init = List.exists (function (_,NO_INIT) -> false | _ -> true)
 
@@ -125,7 +127,8 @@ let glob_is_def = function
      | Tenum(_,Some _,_) -> true
      | Tenum(_,None,_) -> false
      | _ -> false)
-  | GLOBASM _ | PRAGMA _ | LINKAGE _ | GLOBANNOT _ | CUSTOM _ -> false
+  | GLOBASM _ | PRAGMA _ | STATIC_ASSERT _
+  | LINKAGE _ | GLOBANNOT _ | CUSTOM _ -> false
 
 let decl_of_def = function
   | FUNDEF (_,(s,n),_,b,_) -> DECDEF(None,(s,[n,NO_INIT]),b)
@@ -384,7 +387,7 @@ class compute_deps =
                  Dependencies.set_symbol Field n false (Option.get current_def)
                in
                List.iter process_name l
-             | TYPE_ANNOT _ -> ()
+             | TYPE_ANNOT _ | STATIC_ASSERT_FG _ -> ()
            in
            List.iter process_tag l
          | _ -> ())