WIP fix stack overflow

This commit is contained in:
2025-12-14 02:54:56 -07:00
parent 30b564a153
commit b7fbc499b6
5 changed files with 15 additions and 4 deletions

View File

@@ -930,7 +930,7 @@ checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
[[package]]
name = "slang"
version = "0.3.0"
version = "0.3.1"
dependencies = [
"anyhow",
"clap",

View File

@@ -264,7 +264,7 @@ impl<'a> Compiler<'a> {
fn next_label_name(&mut self) -> Cow<'a, str> {
self.label_counter += 1;
Cow::from(format!("L{}", self.label_counter))
Cow::from(format!("__internal_L{}", self.label_counter))
}
fn expression(

View File

@@ -14,6 +14,10 @@ pub fn find_leaf_functions(instructions: &[InstructionNode]) -> HashSet<String>
for node in instructions {
match &node.instruction {
Instruction::LabelDef(label) => {
if label.starts_with("__internal_L") {
continue;
}
// If we were tracking a function, and it remained a leaf until now, save it.
if let Some(name) = current_label.take()
&& is_current_leaf

View File

@@ -99,7 +99,7 @@ fn optimize_leaf_functions<'a>(
// First scan: Identify instructions to remove and capture RA offsets
for (i, node) in input.iter().enumerate() {
match &node.instruction {
Instruction::LabelDef(label) => {
Instruction::LabelDef(label) if !label.starts_with("__internal_L") => {
current_function = Some(label.to_string());
function_start_indices.insert(label.to_string(), i);
}

View File

@@ -53,6 +53,9 @@ struct Args {
/// The output file for the compiled program. If not set, output will go to stdout.
#[arg(short, long)]
output_file: Option<PathBuf>,
/// Should Slang attempt to optimize the output?
#[arg(short = 'z', long)]
optimize: bool,
}
fn run_logic<'a>() -> Result<(), Error<'a>> {
@@ -107,7 +110,11 @@ fn run_logic<'a>() -> Result<(), Error<'a>> {
}
}
if args.optimize {
optimizer::optimize(instructions).write(&mut writer)?;
} else {
instructions.write(&mut writer)?;
}
writer.flush()?;