fixed analysis codegen