--- /tmp/d0_llvm.txt	2018-03-24 13:34:12.700301122 -0700
+++ /tmp/d3_llvm.txt	2018-03-24 13:33:46.339261318 -0700
@@ -44,12 +44,8 @@
 A_Indirection
 AlenState
 Alias
-alias_iterator
-AliasListType
-AlignmentsTy
 AllocateDesc
 AllocateDescKind
-allocator_type
 AllocBlock
 AllocChunk
 allocfunc
@@ -131,7 +127,6 @@
 ArchiveMode
 ArchiverOutput
 ArchiverStage
-arg_iterator
 ArrayAnalyzeExtraData
 ArrayBuildState
 ArrayBuildStateAny
@@ -206,11 +201,7 @@
 Barrier
 BaseBackupCmd
 basebackup_options
-_Base_ptr
-BaseT
-__base_type
 base_yy_extra_type
-BasicBlockListType
 BeginDirectModify_function
 BeginForeignModify_function
 BeginForeignScan_function
@@ -251,7 +242,6 @@
 BlockedProcsData
 BlockId
 BlockIdData
-block_iterator
 BlockNumber
 BlockSampler
 BlockSamplerData
@@ -315,7 +305,6 @@
 __builtin_va_list
 BulkInsertState
 BumpPtrAllocator
-bundle_op_iterator
 Byte
 bytea
 Bytef
@@ -328,7 +317,6 @@
 CallStmt
 CancelRequestPacket
 CaseExpr
-CaseIt
 CaseTestExpr
 CaseWhen
 Cash
@@ -345,10 +333,8 @@
 CEOUC_WAIT_MODE
 CFuncHashTabEntry
 ChangeVarNodes_context
-_Char_alloc_type
 charbufferproc
 char_traits<char32_t>
-char_type
 check_agg_arguments_context
 check_function_callback
 check_network_data
@@ -412,7 +398,6 @@
 ComboCidEntryData
 ComboCidKey
 ComboCidKeyData
-ComdatSymTabType
 Command
 CommandDest
 CommandId
@@ -440,42 +425,13 @@
 ConnType
 ConsiderSplitContext
 Const
-const_alias_iterator
-const_arg_iterator
-const_arg_type_t
-_Const_Base_ptr
-const_block_iterator
-const_bundle_op_iterator
-ConstCaseIt
-const_global_iterator
-const_global_object_iterator
-const_global_value_iterator
 const_gvsummary_iterator
-const_handler_iterator
-const_handler_range
-const_ifunc_iterator
-__const_iterator
-const_iterator
-ConstIterator
-_Const_Link_type
-const_named_metadata_iterator
-const_op_iterator
-const_op_range
-const_pointer
-ConstPtrType
 Constraint
 ConstraintCategory
 ConstraintInfo
 ConstraintsSetStmt
 ConstrCheck
-const_reference
-const_reverse_iterator
-const_reverse_self_iterator
 ConstrType
-const_self_iterator
-const_use_iterator
-const_user_iterator
-const_void_pointer
 contain_aggs_of_level_context
 ControlData
 ControlFileData
@@ -575,7 +531,6 @@
 DefElem
 DefElemAction
 DefineStmt
-deleter_type
 DeleteStmt
 deparse_columns
 deparse_context
@@ -591,7 +546,6 @@
 destructor
 __dev_t
 dev_t
-DiagnosticHandlerTy
 DICompositeTypeArray
 DictISpell
 DictSimple
@@ -599,7 +553,6 @@
 DictSubState
 DictSyn
 DictThesaurus
-difference_type
 DIGlobalVariableExpressionArray
 DIImportedEntityArray
 DILocalVariableArray
@@ -688,7 +641,6 @@
 EDGE
 EDIPARTYNAME
 EditableObjectType
-element_iterator
 ElementsState
 eLogType
 emit_log_hook_type
@@ -716,7 +668,6 @@
 EquivalenceMember
 ErrorContextCallback
 ErrorData
-error_type
 EState
 EstimateDSMForeignScan_function
 eval_const_expressions_context
@@ -786,7 +737,6 @@
 ExtensionInfo
 ExtensionMemberId
 ExtensionVersionInfo
-ExtraData
 FakeRelCacheEntry
 FakeRelCacheEntryData
 false_type
@@ -812,7 +762,6 @@
 finalize_primnode_context
 find_expr_references_context
 FindSplitData
-first_type
 FixedParallelExecutorState
 FixedParallelState
 FixedParamState
@@ -986,7 +935,6 @@
 FunctionCallInfoData
 FunctionInlineState
 FunctionInlineStates
-FunctionListType
 FunctionParameter
 FunctionParameterMode
 FunctionScan
@@ -1097,11 +1045,7 @@
 gistxlogPage
 gistxlogPageSplit
 gistxlogPageUpdate
-global_iterator
-GlobalListType
-global_object_iterator
 GlobalTransaction
-global_value_iterator
 GlobalValueSummaryList
 GlobalValueSummaryMapTy
 globhook_t
@@ -1137,12 +1081,9 @@
 GucStackState
 GucStringAssignHook
 GucStringCheckHook
-GUID
 gvsummary_iterator
 GVSummaryMapTy
 gzFile
-handler_iterator
-handler_range
 Hash
 HASHACTION
 HashAllocFunc
@@ -1203,8 +1144,6 @@
 IdentLine
 IfStackElem
 ifState
-ifunc_iterator
-IFuncListType
 ilist
 imaxdiv_t
 import_error_callback_arg
@@ -1254,13 +1193,11 @@
 InferenceElem
 INFIX
 InfoItem
-_Inherited
 InhInfo
 InitializeDSMForeignScan_function
 InitializeWorkerForeignScan_function
 initproc
 InitSampleScan_function
-InlineAsmDiagHandlerTy
 InlineCodeBlock
 inline_error_callback_arg
 InlineSearchPath
@@ -1270,10 +1207,8 @@
 __ino_t
 ino_t
 in_port_t
-input_iterator
 inquiry
 InsertStmt
-InstListType
 instr_time
 Instrumentation
 int128
@@ -1311,10 +1246,8 @@
 intmax_t
 IntoClause
 intptr_t
-int_type
 InvalidationChunk
 InvalidationListHeader
-_Invoker_type
 IOFuncSelector
 _IO_lock_t
 IpcMemoryId
@@ -1328,14 +1261,11 @@
 ItemIdData
 itemIdSort
 itemIdSortData
-ItemParentClass
 ItemPointer
 ItemPointerData
 IterateDirectModify_function
 IterateForeignScan_function
 IterateJsonStringValuesState
-iterator
-iterator_type
 iternextfunc
 JEntry
 JHashState
@@ -1384,7 +1314,6 @@
 JsValue
 JunkFilter
 KeyArray
-key_compare
 keyEntryData
 Keymap
 KEYMAP_ENTRY
@@ -1392,7 +1321,6 @@
 KeySuffix
 __key_t
 key_t
-key_type
 KeyWord
 LabelProvider
 LargeObjectDesc
@@ -1417,7 +1345,6 @@
 LimitStateCond
 LINE
 line_t
-_Link_type
 List
 ListCell
 ListDictionary
@@ -1426,7 +1353,6 @@
 ListenStmt
 ListParsedLex
 list_qsort_comparator
-ListTy
 lldiv_t
 LLVMAttributeRef
 LLVMBasicBlockRef
@@ -1525,10 +1451,6 @@
 macaddr_sortsupport_state
 MAGIC
 __make_not_void
-_Manager_type
-MapEntryTy
-mapped_type
-MapT
 map_variable_attnos_context
 Material
 MaterialPath
@@ -1542,9 +1464,7 @@
 __mbstate_t
 mbstate_t
 mbverifier
-MD5_u32plus
 MdfdVec
-MDMapT
 MemoryContext
 MemoryContextCallback
 MemoryContextCallbackFunction
@@ -1577,7 +1497,6 @@
 ModifyTablePath
 ModifyTableState
 ModuleHash
-ModuleInfo
 ModulePathStringTableTy
 MorphOpaque
 movedb_failure_params
@@ -1591,8 +1510,6 @@
 MultiXactOffset
 MultiXactStateData
 MultiXactStatus
-mutable_op_range
-mutex_type
 MVDependencies
 MVDependency
 MVNDistinct
@@ -1605,8 +1522,6 @@
 NameData
 NamedLWLockTranche
 NamedLWLockTrancheRequest
-NamedMDListType
-named_metadata_iterator
 NamedTuplestoreScan
 NamedTuplestoreScanState
 NameHashEntry
@@ -1627,12 +1542,7 @@
 __nlink_t
 Node
 NODE
-_Node_allocator
-node_base_type
-node_pointer
-node_reference
 NodeTag
-node_type
 NonEmptyRange
 Notification
 NotifyStmt
@@ -1699,8 +1609,6 @@
 OpfamilyInfo
 OpFamilyMember
 OpFamilyOpFuncGroup
-op_iterator
-op_range
 OprCacheEntry
 OprCacheKey
 OprInfo
@@ -1709,7 +1617,6 @@
 OSAPerGroupState
 OSAPerQueryState
 OSInfo
-other
 OTHERNAME
 OutputContext
 OutputPluginCallbacks
@@ -1718,7 +1625,6 @@
 OverrideSearchPath
 OverrideStackEntry
 OverridingKind
-OwnerTy
 PADLIST
 PADNAME
 PADNAMELIST
@@ -1757,7 +1663,6 @@
 ParamExecData
 ParamExternData
 ParamFetchHook
-param_iterator
 ParamKind
 ParamListInfo
 ParamPathInfo
@@ -2085,10 +1990,7 @@
 PMSignalReason
 PMState
 Point
-pointer
 Pointer
-PointersTy
-__pointer_type
 PolicyInfo
 POLYGON
 PolyNumAggState
@@ -2281,7 +2183,6 @@
 ReadExtraTocPtrType
 ReadFunc
 ReassignOwnedStmt
-rebind_alloc
 RecheckForeignScan_function
 RecordCacheEntry
 RecordCompareData
@@ -2295,7 +2196,6 @@
 RecursiveUnionState
 reduce_outer_joins_state
 REENTR
-reference
 RefetchForeignRow_function
 RefreshMatViewStmt
 regex_arc_t
@@ -2392,7 +2292,6 @@
 ReplicationStateOnDisk
 RepOriginId
 reprfunc
-_Rep_type
 ReScanForeignScan_function
 re_scream_pos_data
 ReservoirState
@@ -2410,11 +2309,7 @@
 ResultPath
 ResultRelInfo
 ResultState
-ret_type
-RetType
 ReturnSetInfo
-reverse_iterator
-reverse_self_iterator
 RevmapContents
 rewrite_event
 RewriteMappingDataEntry
@@ -2498,9 +2393,6 @@
 segcountproc
 Selectivity
 SelectStmt
-Self
-_Self
-self_iterator
 SemiAntiJoinFactors
 sem_t
 SeqScan
@@ -2535,7 +2427,6 @@
 set_rel_pathlist_hook_type
 setter
 SetToDefault
-set_type
 SetupWorkerPtrType
 SHA256_CTX
 SHA512_CTX
@@ -2597,12 +2488,10 @@
 SimpleStats
 SimpleStringList
 SimpleStringListCell
-SimpleType
 SingleBoundSortItem
 SISeg
 Size
 size_t
-size_type
 SlabBlock
 SlabChunk
 SlabContext
@@ -2750,12 +2639,10 @@
 stemmer_module
 stmtCacheEntry
 StopList
-storage_type
 storeRes_func
 StrategyNumber
 StreamCtl
 stream_stop_callback
-string
 StringInfo
 StringInfoData
 StripnullState
@@ -2774,20 +2661,12 @@
 substitute_actual_srf_parameters_context
 substitute_multiple_relids_context
 SubTransactionId
-subtype_iterator
-subtype_reverse_iterator
 SubXactCallback
 SubXactCallbackItem
 SubXactEvent
-succ_const_iterator
-succ_const_range
-succ_iterator
-succ_range
 __suseconds_t
 SVCOMPARE_t
 svtype
-SwitchInstT
-SwitchInstType
 symbol
 SyncRepConfigData
 SyscacheCallbackFunction
@@ -2976,10 +2855,6 @@
 Tcl_WideInt
 Tcl_WideUInt
 Tcl_ZlibStream
-td_const_iterator
-td_const_range
-td_iterator
-td_range
 TempDICompileUnit
 TempDICompositeType
 TempDIDerivedType
@@ -3038,7 +2913,6 @@
 TocEntry
 TokenAuxData
 TokenizedLine
-_Tp_alloc_type
 TParser
 TParserCharTest
 TParserPosition
@@ -3134,9 +3008,7 @@
 TxidEpoch
 TxidSnapshot
 TYPCATEGORY
-type
 Type
-_Type
 TypeCacheEntry
 TypeCacheEnumData
 TypeCast
@@ -3198,9 +3070,7 @@
 UpdateStmt
 UpperRelationKind
 UpperUniquePath
-use_iterator
 UserAuth
-user_iterator
 UserMapping
 UserOpts
 utf_local_conversion_func
@@ -3213,17 +3083,11 @@
 VacuumStmt
 validate_string_relopt
 va_list
-ValTy
 Value
-ValueAdder
-value_compare
-ValueMapCVH
-ValueMapT
 ValueName
 ValuesScan
 ValuesScanState
 ValueToValueMapTy
-value_type
 varatt_expanded
 varattrib_1b
 varattrib_1b_e
@@ -3243,7 +3107,6 @@
 VarParamState
 VarString
 VarStringSortSupport
-vector_type
 VersionedQuery
 ViewCheckOption
 ViewOptions
@@ -3318,8 +3181,6 @@
 WordEntryPos
 WordEntryPosVector
 WordEntryPosVector1
-_WordT
-WordType
 WorkerInfo
 WorkerInfoData
 WorkerInstrumentation
@@ -3328,7 +3189,6 @@
 Working_State
 WorkTableScan
 WorkTableScanState
-wrap
 WritebackContext
 writebufferproc
 WriteBufPtrType
@@ -3463,7 +3323,6 @@
 XPVIO
 XPVIV
 XPVNV
-YieldCallbackTy
 YY_BUFFER_STATE
 YY_CHAR
 YYLTYPE