nits

esphome/cpp_generator.py

@@ -584,7 +584,7 @@ def Pvariable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj":
         # For 'new' allocations, use placement new into static storage
         # to avoid heap fragmentation on embedded devices.
         the_type = id_.type
-        storage_name = f"{id_.id}_storage_"
+        storage_name = f"{id_.id}__pstorage"
 
         # Declare aligned byte array for the object storage
         CORE.add_global(
@@ -603,7 +603,10 @@ def Pvariable(id_: ID, rhs: SafeExpType, type_: "MockObj" = None) -> "MockObj":
         # Extract args from the CallExpression and rebuild as placement new.
         # Template args are already encoded in the_type (e.g. GlobalsComponent<int>),
         # so we only pass the constructor args, not template_args.
-        call_expr = rhs.base  # CallExpression("new Type", args...)
+        call_expr = rhs.base
+        assert isinstance(call_expr, CallExpression), (
+            f"Expected CallExpression for placement new, got {type(call_expr)}"
+        )
         placement_new = CallExpression(f"new({id_.id}) {the_type}", *call_expr.args)
         CORE.add(ExpressionStatement(placement_new))
     else:

tests/component_tests/deep_sleep/test_deep_sleep.py

@@ -8,7 +8,7 @@ def test_deep_sleep_setup(generate_main):
     main_cpp = generate_main("tests/component_tests/deep_sleep/test_deep_sleep1.yaml")
 
     assert (
-        "static deep_sleep::DeepSleepComponent *const deepsleep = reinterpret_cast<deep_sleep::DeepSleepComponent *>(deepsleep_storage_);"
+        "static deep_sleep::DeepSleepComponent *const deepsleep = reinterpret_cast<deep_sleep::DeepSleepComponent *>(deepsleep__pstorage);"
         in main_cpp
     )
     assert "new(deepsleep) deep_sleep::DeepSleepComponent();" in main_cpp

tests/component_tests/image/test_init.py

@@ -242,11 +242,11 @@ def test_image_generation(
     main_cpp = generate_main(component_config_path("image_test.yaml"))
     assert "uint8_t_id[] PROGMEM = {0x24, 0x21, 0x24, 0x21" in main_cpp
     assert (
-        "alignas(image::Image) static unsigned char cat_img_storage_[sizeof(image::Image)];"
+        "alignas(image::Image) static unsigned char cat_img__pstorage[sizeof(image::Image)];"
         in main_cpp
     )
     assert (
-        "static image::Image *const cat_img = reinterpret_cast<image::Image *>(cat_img_storage_);"
+        "static image::Image *const cat_img = reinterpret_cast<image::Image *>(cat_img__pstorage);"
         in main_cpp
     )
     assert (

tests/component_tests/mipi_dsi/test_mipi_dsi_config.py

@@ -119,11 +119,11 @@ def test_code_generation(
 
     main_cpp = generate_main(component_fixture_path("mipi_dsi.yaml"))
     assert (
-        "alignas(mipi_dsi::MIPI_DSI) static unsigned char p4_nano_storage_[sizeof(mipi_dsi::MIPI_DSI)];"
+        "alignas(mipi_dsi::MIPI_DSI) static unsigned char p4_nano__pstorage[sizeof(mipi_dsi::MIPI_DSI)];"
         in main_cpp
     )
     assert (
-        "static mipi_dsi::MIPI_DSI *const p4_nano = reinterpret_cast<mipi_dsi::MIPI_DSI *>(p4_nano_storage_);"
+        "static mipi_dsi::MIPI_DSI *const p4_nano = reinterpret_cast<mipi_dsi::MIPI_DSI *>(p4_nano__pstorage);"
         in main_cpp
     )
     assert (

tests/component_tests/status_led/test_status_led.py

@@ -13,11 +13,11 @@ def test_status_led_generation(
     """Test status_led generation."""
     main_cpp = generate_main(component_config_path("status_led_test.yaml"))
     assert (
-        "alignas(status_led::StatusLED) static unsigned char status_led_statusled_id_storage_[sizeof(status_led::StatusLED)];"
+        "alignas(status_led::StatusLED) static unsigned char status_led_statusled_id__pstorage[sizeof(status_led::StatusLED)];"
         in main_cpp
     )
     assert (
-        "static status_led::StatusLED *const status_led_statusled_id = reinterpret_cast<status_led::StatusLED *>(status_led_statusled_id_storage_);"
+        "static status_led::StatusLED *const status_led_statusled_id = reinterpret_cast<status_led::StatusLED *>(status_led_statusled_id__pstorage);"
         in main_cpp
     )
     assert "new(status_led_statusled_id) status_led::StatusLED(" in main_cpp