Set up code under _LIBCXX_DYNAMIC_FALLBACK which is off by default. For a full description of _LIBCXX_DYNAMIC_FALLBACK, see src/private_typeinfo.cpp.

llvm-svn: 164863

1 files changed, 12 insertions, 12 deletions

diff --git a/libcxxabi/src/private_typeinfo.h b/libcxxabi/src/private_typeinfo.h
index 0219fa182220..c8da8145f9ce 100644
--- a/libcxxabi/src/private_typeinfo.h
+++ b/libcxxabi/src/private_typeinfo.h
@@ -76,10 +76,10 @@ struct __dynamic_cast_info
 {
 // const data supplied to the search:
 
-    const __class_type_info* const dst_type;
-    const void* const static_ptr;
-    const __class_type_info* const static_type;
-    const std::ptrdiff_t src2dst_offset;
+    const __class_type_info* dst_type;
+    const void* static_ptr;
+    const __class_type_info* static_type;
+    std::ptrdiff_t src2dst_offset;
 
 // Data that represents the answer:
 
@@ -133,9 +133,9 @@ public:
     __attribute__ ((__visibility__("hidden")))
         void process_found_base_class(__dynamic_cast_info*, void*, int) const;
     __attribute__ ((__visibility__("hidden")))
-        virtual void search_above_dst(__dynamic_cast_info*, const void*, const void*, int) const;
+        virtual void search_above_dst(__dynamic_cast_info*, const void*, const void*, int, bool) const;
     __attribute__ ((__visibility__("hidden")))
-        virtual void search_below_dst(__dynamic_cast_info*, const void*, int) const;
+        virtual void search_below_dst(__dynamic_cast_info*, const void*, int, bool) const;
     __attribute__ ((__visibility__("hidden")))
         virtual bool can_catch(const __shim_type_info*, void*&) const;
     __attribute__ ((__visibility__("hidden")))
@@ -152,9 +152,9 @@ public:
     __attribute__ ((__visibility__("hidden"))) virtual ~__si_class_type_info();
 
     __attribute__ ((__visibility__("hidden")))
-        virtual void search_above_dst(__dynamic_cast_info*, const void*, const void*, int) const;
+        virtual void search_above_dst(__dynamic_cast_info*, const void*, const void*, int, bool) const;
     __attribute__ ((__visibility__("hidden")))
-        virtual void search_below_dst(__dynamic_cast_info*, const void*, int) const;
+        virtual void search_below_dst(__dynamic_cast_info*, const void*, int, bool) const;
     __attribute__ ((__visibility__("hidden")))
         virtual void has_unambiguous_public_base(__dynamic_cast_info*, void*, int) const;
 };
@@ -172,8 +172,8 @@ public:
         __offset_shift = 8
     };
 
-    void search_above_dst(__dynamic_cast_info*, const void*, const void*, int) const;
-    void search_below_dst(__dynamic_cast_info*, const void*, int) const;
+    void search_above_dst(__dynamic_cast_info*, const void*, const void*, int, bool) const;
+    void search_below_dst(__dynamic_cast_info*, const void*, int, bool) const;
     void has_unambiguous_public_base(__dynamic_cast_info*, void*, int) const;
 };
 
@@ -197,9 +197,9 @@ public:
     __attribute__ ((__visibility__("hidden"))) virtual ~__vmi_class_type_info();
 
     __attribute__ ((__visibility__("hidden")))
-        virtual void search_above_dst(__dynamic_cast_info*, const void*, const void*, int) const;
+        virtual void search_above_dst(__dynamic_cast_info*, const void*, const void*, int, bool) const;
     __attribute__ ((__visibility__("hidden")))
-        virtual void search_below_dst(__dynamic_cast_info*, const void*, int) const;
+        virtual void search_below_dst(__dynamic_cast_info*, const void*, int, bool) const;
     __attribute__ ((__visibility__("hidden")))
         virtual void has_unambiguous_public_base(__dynamic_cast_info*, void*, int) const;
 };