DependencySerializationTraitPass does not add _serviceId to decorated services

Core uses a compile pass (defined in DependencySerializationTraitPass) to attach a property (_serviceId) to all defined services.

The Symfony Service Container allows decorating a service (http://symfony.com/doc/current/components/dependency_injection/advanced....):

  webprofiler.debug.config.factory:
    class: Drupal\webprofiler\Config\ConfigFactoryWrapper
    public: false
    decorates: config.factory
    arguments: ['@webprofiler.debug.config.factory.inner', '@webprofiler.config']

but the DependencySerializationTraitPass class fails to set the property _serivceId on the correct service:

protected function getConfig_FactoryService()
{
  $a = new \Drupal\Core\Config\ConfigFactory($this->get('config.storage'), $this->get('webprofiler.debug.event_dispatcher'), $this->get('config.typed'));
  $a->_serviceId = 'config.factory';

  return $this->services['config.factory'] = new \Drupal\webprofiler\Config\ConfigFactoryWrapper($a, $this->get('webprofiler.config'));
}

should be

protected function getConfig_FactoryService()
{
  $this->services['config.factory'] = $instance = new \Drupal\webprofiler\Config\ConfigFactoryWrapper(new \Drupal\Core\Config\ConfigFactory($this->get('config.storage'), $this->get('webprofiler.debug.event_dispatcher'), $this->get('config.typed')), $this->get('webprofiler.config'));

  $instance->_serviceId = 'config.factory';

  return $instance;
}

Beta phase evaluation