Align nodes when !SupportsRelativePointers (#67516)

MichalStrehovsky · web-flow · commit 5453951a0687 · 2022-04-04T13:14:58.000+09:00
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExternalReferencesTableNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExternalReferencesTableNode.cs
@@ -93,6 +93,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)
             _insertedSymbolsDictionary = null;
 
             var builder = new ObjectDataBuilder(factory, relocsOnly);
+            builder.RequireInitialAlignment(factory.Target.SupportsRelativePointers ? 4 : factory.Target.PointerSize);
 
             foreach (SymbolAndDelta symbolAndDelta in _insertedSymbols)
             {
diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/SealedVTableNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/SealedVTableNode.cs
@@ -201,7 +201,7 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact
         public override ObjectData GetData(NodeFactory factory, bool relocsOnly)
         {
             ObjectDataBuilder objData = new ObjectDataBuilder(factory, relocsOnly);
-            objData.RequireInitialAlignment(4);
+            objData.RequireInitialAlignment(factory.Target.SupportsRelativePointers ? 4 : factory.Target.PointerSize);
             objData.AddSymbol(this);
 
             if (BuildSealedVTableSlots(factory, relocsOnly))

Original file line number	Diff line number	Diff line change
`@@ -93,6 +93,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false)`
`93`	`93`	`_insertedSymbolsDictionary = null;`
`94`	`94`
`95`	`95`	`var builder = new ObjectDataBuilder(factory, relocsOnly);`
	`96`	`+ builder.RequireInitialAlignment(factory.Target.SupportsRelativePointers ? 4 : factory.Target.PointerSize);`
`96`	`97`
`97`	`98`	`foreach (SymbolAndDelta symbolAndDelta in _insertedSymbols)`
`98`	`99`	`{`
Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,7 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact`
`201`	`201`	`public override ObjectData GetData(NodeFactory factory, bool relocsOnly)`
`202`	`202`	`{`
`203`	`203`	`ObjectDataBuilder objData = new ObjectDataBuilder(factory, relocsOnly);`
`204`		`- objData.RequireInitialAlignment(4);`
	`204`	`+ objData.RequireInitialAlignment(factory.Target.SupportsRelativePointers ? 4 : factory.Target.PointerSize);`
`205`	`205`	`objData.AddSymbol(this);`
`206`	`206`
`207`	`207`	`if (BuildSealedVTableSlots(factory, relocsOnly))`