Handle protected internal in HackC IR and assembly

Summary: The issue was revealed by D76516094 that moves protected internal experimental feature to preview status. This diff makes sure that protected internal is being correctly translated for both HackC IR and assembly.

Reviewed By: francesco-zappa-nardelli

Differential Revision: D77148070

fbshipit-source-id: 4a703343da7277251c79b5dd0e9041a81afb4d29

Author: geralt-encore

hphp/hack/src/hackc/assemble/assemble.rs

@@ -573,6 +573,8 @@ fn assemble_property(token_iter: &mut Lexer<'_>) -> Result<hhbc::Property> {
 fn determine_visibility(attr: &hhvm_types_ffi::ffi::Attr) -> Result<hhbc::Visibility> {
     let v = if attr.is_internal() && attr.is_public() {
         hhbc::Visibility::Internal
+    } else if attr.is_internal() && attr.is_protected() {
+        hhbc::Visibility::ProtectedInternal
     } else if attr.is_public() {
         hhbc::Visibility::Public
     } else if attr.is_private() {

hphp/hack/src/hackc/ir/assemble/parse.rs

@@ -3,6 +3,8 @@
 // This source code is licensed under the MIT license found in the
 // LICENSE file in the "hack" directory of this source tree.
 
+use std::result::Result::Ok;
+
 use anyhow::Result;
 use ir_core::AsTypeStructExceptionKind;
 use ir_core::Attr;
@@ -822,13 +824,24 @@ fn parse_var(tokenizer: &mut Tokenizer<'_>) -> Result<StringId> {
 }
 
 pub(crate) fn parse_visibility(tokenizer: &mut Tokenizer<'_>) -> Result<Visibility> {
-    parse_enum(tokenizer, "Visibility", |id| {
+    let vis1 = parse_enum(tokenizer, "Visibility", str_to_visibility_fn())?;
+    let vis2 = parse_opt_enum(tokenizer, str_to_visibility_fn())?;
+    let vis = match (vis1, vis2) {
+        (Visibility::Protected, Some(Visibility::Internal)) => Visibility::ProtectedInternal,
+        (Visibility::Internal, Some(Visibility::Protected)) => Visibility::ProtectedInternal,
+        _ => vis1,
+    };
+    Ok(vis)
+}
+
+fn str_to_visibility_fn() -> impl FnOnce(&str) -> Option<Visibility> {
+    |id| {
         Some(match id {
             "private" => Visibility::Private,
             "public" => Visibility::Public,
             "protected" => Visibility::Protected,
             "internal" => Visibility::Internal,
             _ => return None,
         })
-    })
+    }
 }