@@ -44,8 +44,12 @@ pub struct Object {
4444 /// Linker symbols that were not provided at compile time.
4545 /// Such symbols must be resolved by tooling before deployment.
4646 pub unlinked_symbols : BTreeMap < String , Vec < u64 > > ,
47- /// Whether the object is already assembled.
48- pub is_assembled : bool ,
47+ /// How far the object is on its way to bytecode.
48+ pub stage : Stage ,
49+ /// The assembled, unlinked object, which the objects embedding this one read; kept by a worker
50+ /// that linked the object itself, since linking replaces `bytecode`.
51+ #[ serde( with = "serde_bytes" ) ]
52+ pub assembled_bytecode : Option < Vec < u8 > > ,
4953 /// Whether the size fallback was activated during the compilation.
5054 pub is_size_fallback : bool ,
5155 /// Compilation warnings.
@@ -54,6 +58,19 @@ pub struct Object {
5458 pub benchmarks : Vec < ( String , u64 ) > ,
5559}
5660
61+ ///
62+ /// How far an object is on its way to bytecode.
63+ ///
64+ #[ derive( Debug , Clone , Copy , PartialEq , Eq , serde:: Serialize , serde:: Deserialize ) ]
65+ pub enum Stage {
66+ /// Compiled to an ELF object that still names the objects it embeds.
67+ Compiled ,
68+ /// Assembled with the objects it embeds; library addresses are still unresolved.
69+ Assembled ,
70+ /// Linked to bytecode.
71+ Linked ,
72+ }
73+
5774impl Object {
5875 /// Length of the library placeholder.
5976 pub const LIBRARY_PLACEHOLDER_LENGTH : usize = 17 ;
@@ -92,7 +109,8 @@ impl Object {
92109 metadata_bytes,
93110 dependencies,
94111 unlinked_symbols : BTreeMap :: new ( ) ,
95- is_assembled : false ,
112+ stage : Stage :: Compiled ,
113+ assembled_bytecode : None ,
96114 is_size_fallback,
97115 warnings,
98116 benchmarks,
@@ -125,14 +143,27 @@ impl Object {
125143 }
126144
127145 ///
128- /// Assembles the object.
146+ /// The assembled object, which the objects embedding this one read, once it is assembled.
147+ ///
148+ pub fn assembled_bytecode ( & self ) -> Option < & [ u8 ] > {
149+ match self . stage {
150+ Stage :: Compiled => None ,
151+ Stage :: Assembled | Stage :: Linked => self
152+ . assembled_bytecode
153+ . as_deref ( )
154+ . or ( self . bytecode . as_deref ( ) ) ,
155+ }
156+ }
157+
158+ ///
159+ /// Assembles the object with `dependencies`, the assembled objects it embeds by identifier.
129160 ///
130161 /// # Panics
131162 /// If bytecode is `None`.
132163 ///
133164 pub fn assemble (
134165 & self ,
135- objects_by_id : & BTreeMap < & str , & Self > ,
166+ dependencies : & BTreeMap < & str , & [ u8 ] > ,
136167 ) -> anyhow:: Result < inkwell:: memory_buffer:: MemoryBuffer > {
137168 let memory_buffer = self . to_memory_buffer ( ) ?;
138169
@@ -142,17 +173,15 @@ impl Object {
142173 memory_buffers. push ( ( self . identifier . to_owned ( ) , memory_buffer) ) ;
143174
144175 memory_buffers. extend ( self . dependencies . into_iter ( ) . map ( |dependency| {
145- let original_dependency_identifier = dependency. to_owned ( ) ;
146- let dependency = objects_by_id
176+ let bytecode = dependencies
147177 . get ( dependency. as_str ( ) )
148- . expect ( "Dependency not found" ) ;
149- let dependency_bytecode = dependency. bytecode . as_deref ( ) . expect ( "Bytecode is not set" ) ;
178+ . expect ( "Every dependency is assembled before the objects embedding it" ) ;
150179 let memory_buffer = inkwell:: memory_buffer:: MemoryBuffer :: create_from_memory_range (
151- dependency_bytecode ,
152- dependency. identifier . as_str ( ) ,
180+ bytecode ,
181+ dependency. as_str ( ) ,
153182 false ,
154183 ) ;
155- ( original_dependency_identifier , memory_buffer)
184+ ( dependency . to_owned ( ) , memory_buffer)
156185 } ) ) ;
157186
158187 let bytecode_buffers = memory_buffers
@@ -170,6 +199,52 @@ impl Object {
170199 )
171200 }
172201
202+ ///
203+ /// Records the assembled object: its code with the dependencies embedded, and the references
204+ /// to libraries whose addresses `linker_symbols` does not hold.
205+ ///
206+ pub fn finish_assembly (
207+ & mut self ,
208+ assembled : inkwell:: memory_buffer:: MemoryBuffer ,
209+ linker_symbols : & BTreeMap < String , [ u8 ; solx_utils:: BYTE_LENGTH_ETH_ADDRESS ] > ,
210+ ) {
211+ for undefined_reference in assembled
212+ . get_undefined_references_evm ( )
213+ . into_iter ( )
214+ . filter ( |reference| !linker_symbols. contains_key ( reference) )
215+ {
216+ let symbol_offsets = assembled. get_symbol_offsets_evm ( undefined_reference. as_str ( ) ) ;
217+ self . unlinked_symbols
218+ . insert ( undefined_reference, symbol_offsets) ;
219+ }
220+ self . bytecode = Some ( assembled. as_slice ( ) . to_owned ( ) ) ;
221+ self . stage = Stage :: Assembled ;
222+ }
223+
224+ ///
225+ /// Assembles and links the object in the worker that compiled it, which is possible when it
226+ /// embeds no other contract's object: a runtime object embeds nothing, a deploy object embeds
227+ /// `runtime_bytecode`, its assembled runtime object. The assembled form is kept for the
228+ /// objects that embed this one.
229+ ///
230+ pub fn assemble_and_link_in_worker (
231+ & mut self ,
232+ runtime_bytecode : Option < & [ u8 ] > ,
233+ linker_symbols : & BTreeMap < String , [ u8 ; solx_utils:: BYTE_LENGTH_ETH_ADDRESS ] > ,
234+ ) -> anyhow:: Result < ( ) > {
235+ let dependencies = self
236+ . dependencies
237+ . runtime
238+ . as_deref ( )
239+ . zip ( runtime_bytecode)
240+ . into_iter ( )
241+ . collect ( ) ;
242+ let assembled = self . assemble ( & dependencies) ?;
243+ self . assembled_bytecode = Some ( assembled. as_slice ( ) . to_owned ( ) ) ;
244+ self . finish_assembly ( assembled, linker_symbols) ;
245+ self . link ( linker_symbols)
246+ }
247+
173248 ///
174249 /// Links the object with its linker symbols.
175250 ///
@@ -221,6 +296,7 @@ impl Object {
221296 }
222297 self . bytecode = Some ( linked_object_with_placeholders. as_slice ( ) . to_owned ( ) ) ;
223298 self . bytecode_hex = Some ( bytecode_hex) ;
299+ self . stage = Stage :: Linked ;
224300
225301 Ok ( ( ) )
226302 }
0 commit comments