Add tests for exclusive size

jgkamat · jgkamat · commit 7a3cd2d6bceb · 2023-03-10T11:46:30.000-08:00
diff --git a/test/integration/anonymous.toml b/test/integration/anonymous.toml
@@ -162,24 +162,28 @@ definitions = '''
         "isTypedef": true,
         "staticSize": 8,
         "dynamicSize": 12,
+        "exclusiveSize": 0,
         "members": [{
           "name": "",
           "typeName": "__anon_struct_0",
           "isTypedef": false,
           "staticSize": 8,
           "dynamicSize": 12,
+          "exclusiveSize": 0,
           "members": [{
             "name": "node",
             "typeName": "struct Node *",
             "staticSize": 8,
             "dynamicSize": 12,
+            "exclusiveSize": 8,
             "members": [{
               "typeName": "Node",
               "staticSize": 12,
+              "exclusiveSize": 0,
               "members": [
-                { "name": "a", "staticSize": 4, "dynamicSize": 0 },
-                { "name": "b", "staticSize": 4, "dynamicSize": 0 },
-                { "name": "c", "staticSize": 4, "dynamicSize": 0 }
+                { "name": "a", "staticSize": 4, "exclusiveSize": 4, "dynamicSize": 0 },
+                { "name": "b", "staticSize": 4, "exclusiveSize": 4, "dynamicSize": 0 },
+                { "name": "c", "staticSize": 4, "exclusiveSize": 4, "dynamicSize": 0 }
               ]
             }]
           }]
diff --git a/test/integration/pointers.toml b/test/integration/pointers.toml
@@ -144,10 +144,11 @@ definitions = '''
     expect_json = '''[{
       "staticSize":24,
       "dynamicSize":4,
+      "exclusiveSize":4,
       "members":[
-        {"name":"a", "staticSize":4, "dynamicSize":0},
-        {"name":"b", "staticSize":8, "dynamicSize":4},
-        {"name":"c", "staticSize":8, "dynamicSize":0}
+        {"name":"a", "staticSize":4, "exclusiveSize":4, "dynamicSize":0},
+        {"name":"b", "staticSize":8, "exclusiveSize":8, "dynamicSize":4},
+        {"name":"c", "staticSize":8, "exclusiveSize":8, "dynamicSize":0}
       ]}]'''
   [cases.struct_primitive_ptrs_no_follow]
     param_types = ["const PrimitivePtrs&"]
diff --git a/test/integration/sorted_vector_set.toml b/test/integration/sorted_vector_set.toml
@@ -34,12 +34,14 @@ definitions = '''
     expect_json = '''[{
       "staticSize": 24,
       "dynamicSize": 16,
+      "exclusiveSize": 0,
       "length":3,
       "capacity":4,
       "elementStaticSize":4,
       "members": [{
         "staticSize": 24,
         "dynamicSize": 16,
+        "exclusiveSize": 40,
         "length": 3,
         "capacity": 4,
         "elementStaticSize": 4
diff --git a/test/integration/std_array.toml b/test/integration/std_array.toml
@@ -8,6 +8,7 @@ includes = ["array", "cstdint", "vector"]
       {
         "staticSize": 1,
         "dynamicSize": 0,
+        "exclusiveSize": 1,
         "length": 0,
         "capacity": 0,
         "elementStaticSize": 8
@@ -22,6 +23,7 @@ includes = ["array", "cstdint", "vector"]
       {
         "staticSize": 8,
         "dynamicSize": 0,
+        "exclusiveSize": 8,
         "length": 1,
         "capacity": 1,
         "elementStaticSize": 8
@@ -70,17 +72,20 @@ includes = ["array", "cstdint", "vector"]
       {
         "staticSize": 48,
         "dynamicSize": 72,
+        "exclusiveSize": 0,
         "length": 2,
         "capacity": 2,
         "elementStaticSize": 24,
         "members": [
           {
             "staticSize": 24,
-            "dynamicSize": 40
+            "dynamicSize": 40,
+            "exclusiveSize": 64
           },
           {
             "staticSize": 24,
-            "dynamicSize": 32
+            "dynamicSize": 32,
+            "exclusiveSize": 56
           }
         ]
       }
diff --git a/test/integration/std_optional.toml b/test/integration/std_optional.toml
@@ -8,6 +8,7 @@ includes = ["optional", "cstdint", "vector"]
       {
         "staticSize": 16,
         "dynamicSize": 0,
+        "exclusiveSize": 16,
         "length": 0,
         "capacity": 1,
         "elementStaticSize": 8
@@ -22,6 +23,7 @@ includes = ["optional", "cstdint", "vector"]
       {
         "staticSize": 16,
         "dynamicSize": 0,
+        "exclusiveSize": 16,
         "length": 1,
         "capacity": 1,
         "elementStaticSize": 8
@@ -36,6 +38,7 @@ includes = ["optional", "cstdint", "vector"]
       {
         "staticSize": 32,
         "dynamicSize": 0,
+        "exclusiveSize": 32,
         "length": 0,
         "capacity": 1,
         "elementStaticSize": 24
@@ -50,13 +53,15 @@ includes = ["optional", "cstdint", "vector"]
       {
         "staticSize": 32,
         "dynamicSize": 40,
+        "exclusiveSize": 8,
         "length": 1,
         "capacity": 1,
         "elementStaticSize": 24,
         "members": [
           {
             "staticSize": 24,
             "dynamicSize": 40,
+            "exclusiveSize": 64,
             "length": 5
           }
         ]
diff --git a/test/integration/std_smart_ptr.toml b/test/integration/std_smart_ptr.toml
@@ -14,6 +14,7 @@ definitions = '''
       {
         "staticSize": 8,
         "dynamicSize": 0,
+        "exclusiveSize": 8,
         "length": 0,
         "capacity": 1,
         "elementStaticSize": 8
@@ -56,13 +57,15 @@ definitions = '''
       {
         "staticSize": 8,
         "dynamicSize": 64,
+        "exclusiveSize": 8,
         "length": 1,
         "capacity": 1,
         "elementStaticSize": 24,
         "members": [
           {
             "staticSize": 24,
-            "dynamicSize": 40
+            "dynamicSize": 40,
+            "exclusiveSize": 64
           }
         ]
       }
@@ -159,7 +162,8 @@ definitions = '''
     [
       {
         "staticSize": 16,
-        "dynamicSize": 0
+        "dynamicSize": 0,
+        "exclusiveSize": 16
       }
     ]
     '''
@@ -170,7 +174,8 @@ definitions = '''
     [
       {
         "staticSize": 16,
-        "dynamicSize": 0
+        "dynamicSize": 0,
+        "exclusiveSize": 16
       }
     ]
     '''
diff --git a/test/integration/std_string.toml b/test/integration/std_string.toml
@@ -10,10 +10,12 @@ includes = ["string"]
         "isTypedef": true,
         "staticSize": 32,
         "dynamicSize": 0,
+        "exclusiveSize": 0,
         "members": [
           {
             "staticSize": 32,
             "dynamicSize": 0,
+            "exclusiveSize": 32,
             "length": 0,
             "capacity": 15,
             "elementStaticSize": 1
@@ -32,10 +34,12 @@ includes = ["string"]
         "isTypedef": true,
         "staticSize": 32,
         "dynamicSize": 0,
+        "exclusiveSize": 0,
         "members": [
           {
             "staticSize": 32,
             "dynamicSize": 0,
+            "exclusiveSize": 32,
             "length": 6,
             "capacity": 15,
             "elementStaticSize": 1
@@ -54,10 +58,12 @@ includes = ["string"]
         "isTypedef": true,
         "staticSize": 32,
         "dynamicSize": 26,
+        "exclusiveSize": 0,
         "members": [
           {
             "staticSize": 32,
             "dynamicSize": 26,
+            "exclusiveSize": 58,
             "length": 26,
             "capacity": 26,
             "elementStaticSize": 1
diff --git a/test/integration/std_variant.toml b/test/integration/std_variant.toml
@@ -14,23 +14,25 @@ definitions = '''
     expect_json = '''[{
       "staticSize":16,
       "dynamicSize":0,
+      "exclusiveSize":15,
       "length":1,
       "capacity":1,
       "elementStaticSize":8,
       "members":[
-        {"typeName":"char", "staticSize":1, "dynamicSize":0}
+        {"typeName":"char", "staticSize":1, "exclusiveSize":1, "dynamicSize":0}
       ]}]'''
   [cases.char_int64_2]
     param_types = ["const std::variant<char, int64_t>&"]
     setup = "return 1234;"
     expect_json = '''[{
       "staticSize":16,
       "dynamicSize":0,
+      "exclusiveSize":8,
       "length":1,
       "capacity":1,
       "elementStaticSize":8,
       "members":[
-        {"typeName":"long", "staticSize":8, "dynamicSize":0}
+        {"typeName":"long", "staticSize":8, "exclusiveSize":8, "dynamicSize":0}
       ]}]'''
 
   [cases.vector_int_1]
@@ -39,6 +41,7 @@ definitions = '''
     expect_json = '''[{
       "staticSize":32,
       "dynamicSize":12,
+      "exclusiveSize":8,
       "length":1,
       "capacity":1,
       "elementStaticSize":24,
@@ -47,6 +50,7 @@ definitions = '''
           "typeName":"vector<int, std::allocator<int> >",
           "staticSize":24,
           "dynamicSize":12,
+          "exclusiveSize":36,
           "length":3,
           "capacity":3,
           "elementStaticSize":4
@@ -77,18 +81,20 @@ definitions = '''
     expect_json = '''[{
       "staticSize":24,
       "dynamicSize":0,
+      "exclusiveSize":8,
       "length":1,
       "capacity":1,
       "elementStaticSize":16,
       "members":[
         {
           "staticSize":16,
           "dynamicSize":0,
+          "exclusiveSize":8,
           "length":1,
           "capacity":1,
           "elementStaticSize":8,
           "members":[
-            {"typeName":"long", "staticSize":8, "dynamicSize":0}
+            {"typeName":"long", "staticSize":8, "exclusiveSize":8, "dynamicSize":0}
           ]
         }
       ]}]'''
@@ -109,6 +115,7 @@ definitions = '''
     expect_json = '''[{
       "staticSize":8,
       "dynamicSize":0,
+      "exclusiveSize":8,
       "length":1,
       "capacity":1,
       "elementStaticSize":4,
@@ -125,11 +132,12 @@ definitions = '''
     expect_json = '''[{
       "staticSize":8,
       "dynamicSize":0,
+      "exclusiveSize":7,
       "length":1,
       "capacity":1,
       "elementStaticSize":4,
       "members":[
-        {"typeName":"char", "staticSize":1, "dynamicSize":0}
+        {"typeName":"char", "staticSize":1, "exclusiveSize":1, "dynamicSize":0}
       ]}]'''
   [cases.256_params_empty]
     param_types = ["const std::variant<Thrower,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,int,char>&"]
diff --git a/test/integration/std_vector.toml b/test/integration/std_vector.toml
@@ -17,7 +17,7 @@ includes = ["vector"]
     skip = true # https://github.com/facebookexperimental/object-introspection/issues/14
     param_types = ["const std::vector<bool>&"]
     setup = "return {{true, false, true}};"
-    expect_json = '[{"staticSize":40,"dynamicSize":8, "length":3, "capacity":64, "elementStaticSize":0.125}]'
+    expect_json = '[{"staticSize":40,"dynamicSize":8, "exclusiveSize":40, "length":3, "capacity":64, "elementStaticSize":0.125}]'
   [cases.vector_int_empty]
     param_types = ["const std::vector<std::vector<int>>&"]
     setup = "return {};"
@@ -28,13 +28,14 @@ includes = ["vector"]
     expect_json = '''[{
       "staticSize":24,
       "dynamicSize":96,
+      "exclusiveSize":24,
       "length":3,
       "capacity":3,
       "elementStaticSize":24,
       "members":[
-        {"staticSize":24, "dynamicSize":12, "length":3, "capacity":3, "elementStaticSize":4},
-        {"staticSize":24, "dynamicSize":4, "length":1, "capacity":1, "elementStaticSize":4},
-        {"staticSize":24, "dynamicSize":8, "length":2, "capacity":2, "elementStaticSize":4}
+        {"staticSize":24, "dynamicSize":12, "exclusiveSize":36, "length":3, "capacity":3, "elementStaticSize":4},
+        {"staticSize":24, "dynamicSize":4, "exclusiveSize":28, "length":1, "capacity":1, "elementStaticSize":4},
+        {"staticSize":24, "dynamicSize":8, "exclusiveSize":32, "length":2, "capacity":2, "elementStaticSize":4}
       ]}]'''
   [cases.reserve]
     param_types = ["const std::vector<int>&"]
@@ -43,4 +44,4 @@ includes = ["vector"]
       ret.reserve(10);
       return ret;
     '''
-    expect_json = '[{"staticSize":24, "dynamicSize":40, "length":3, "capacity":10, "elementStaticSize":4}]'
+    expect_json = '[{"staticSize":24, "dynamicSize":40, "exclusiveSize":64, "length":3, "capacity":10, "elementStaticSize":4}]'

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ includes = ["array", "cstdint", "vector"]`
`8`	`8`	`{`
`9`	`9`	`"staticSize": 1,`
`10`	`10`	`"dynamicSize": 0,`
	`11`	`+ "exclusiveSize": 1,`
`11`	`12`	`"length": 0,`
`12`	`13`	`"capacity": 0,`
`13`	`14`	`"elementStaticSize": 8`
`@@ -22,6 +23,7 @@ includes = ["array", "cstdint", "vector"]`
`22`	`23`	`{`
`23`	`24`	`"staticSize": 8,`
`24`	`25`	`"dynamicSize": 0,`
	`26`	`+ "exclusiveSize": 8,`
`25`	`27`	`"length": 1,`
`26`	`28`	`"capacity": 1,`
`27`	`29`	`"elementStaticSize": 8`
`@@ -70,17 +72,20 @@ includes = ["array", "cstdint", "vector"]`
`70`	`72`	`{`
`71`	`73`	`"staticSize": 48,`
`72`	`74`	`"dynamicSize": 72,`
	`75`	`+ "exclusiveSize": 0,`
`73`	`76`	`"length": 2,`
`74`	`77`	`"capacity": 2,`
`75`	`78`	`"elementStaticSize": 24,`
`76`	`79`	`"members": [`
`77`	`80`	`{`
`78`	`81`	`"staticSize": 24,`
`79`		`- "dynamicSize": 40`
	`82`	`+ "dynamicSize": 40,`
	`83`	`+ "exclusiveSize": 64`
`80`	`84`	`},`
`81`	`85`	`{`
`82`	`86`	`"staticSize": 24,`
`83`		`- "dynamicSize": 32`
	`87`	`+ "dynamicSize": 32,`
	`88`	`+ "exclusiveSize": 56`
`84`	`89`	`}`
`85`	`90`	`]`
`86`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ includes = ["optional", "cstdint", "vector"]`
`8`	`8`	`{`
`9`	`9`	`"staticSize": 16,`
`10`	`10`	`"dynamicSize": 0,`
	`11`	`+ "exclusiveSize": 16,`
`11`	`12`	`"length": 0,`
`12`	`13`	`"capacity": 1,`
`13`	`14`	`"elementStaticSize": 8`
`@@ -22,6 +23,7 @@ includes = ["optional", "cstdint", "vector"]`
`22`	`23`	`{`
`23`	`24`	`"staticSize": 16,`
`24`	`25`	`"dynamicSize": 0,`
	`26`	`+ "exclusiveSize": 16,`
`25`	`27`	`"length": 1,`
`26`	`28`	`"capacity": 1,`
`27`	`29`	`"elementStaticSize": 8`
`@@ -36,6 +38,7 @@ includes = ["optional", "cstdint", "vector"]`
`36`	`38`	`{`
`37`	`39`	`"staticSize": 32,`
`38`	`40`	`"dynamicSize": 0,`
	`41`	`+ "exclusiveSize": 32,`
`39`	`42`	`"length": 0,`
`40`	`43`	`"capacity": 1,`
`41`	`44`	`"elementStaticSize": 24`
`@@ -50,13 +53,15 @@ includes = ["optional", "cstdint", "vector"]`
`50`	`53`	`{`
`51`	`54`	`"staticSize": 32,`
`52`	`55`	`"dynamicSize": 40,`
	`56`	`+ "exclusiveSize": 8,`
`53`	`57`	`"length": 1,`
`54`	`58`	`"capacity": 1,`
`55`	`59`	`"elementStaticSize": 24,`
`56`	`60`	`"members": [`
`57`	`61`	`{`
`58`	`62`	`"staticSize": 24,`
`59`	`63`	`"dynamicSize": 40,`
	`64`	`+ "exclusiveSize": 64,`
`60`	`65`	`"length": 5`
`61`	`66`	`}`
`62`	`67`	`]`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ definitions = '''`
`14`	`14`	`{`
`15`	`15`	`"staticSize": 8,`
`16`	`16`	`"dynamicSize": 0,`
	`17`	`+ "exclusiveSize": 8,`
`17`	`18`	`"length": 0,`
`18`	`19`	`"capacity": 1,`
`19`	`20`	`"elementStaticSize": 8`
`@@ -56,13 +57,15 @@ definitions = '''`
`56`	`57`	`{`
`57`	`58`	`"staticSize": 8,`
`58`	`59`	`"dynamicSize": 64,`
	`60`	`+ "exclusiveSize": 8,`
`59`	`61`	`"length": 1,`
`60`	`62`	`"capacity": 1,`
`61`	`63`	`"elementStaticSize": 24,`
`62`	`64`	`"members": [`
`63`	`65`	`{`
`64`	`66`	`"staticSize": 24,`
`65`		`- "dynamicSize": 40`
	`67`	`+ "dynamicSize": 40,`
	`68`	`+ "exclusiveSize": 64`
`66`	`69`	`}`
`67`	`70`	`]`
`68`	`71`	`}`
`@@ -159,7 +162,8 @@ definitions = '''`
`159`	`162`	`[`
`160`	`163`	`{`
`161`	`164`	`"staticSize": 16,`
`162`		`- "dynamicSize": 0`
	`165`	`+ "dynamicSize": 0,`
	`166`	`+ "exclusiveSize": 16`
`163`	`167`	`}`
`164`	`168`	`]`
`165`	`169`	`'''`
`@@ -170,7 +174,8 @@ definitions = '''`
`170`	`174`	`[`
`171`	`175`	`{`
`172`	`176`	`"staticSize": 16,`
`173`		`- "dynamicSize": 0`
	`177`	`+ "dynamicSize": 0,`
	`178`	`+ "exclusiveSize": 16`
`174`	`179`	`}`
`175`	`180`	`]`
`176`	`181`	`'''`