diff --git a/compiler/src/dmd/expressionsem.d b/compiler/src/dmd/expressionsem.d
index 55dd4dd3880d..83d7fc23d593 100644
--- a/compiler/src/dmd/expressionsem.d
+++ b/compiler/src/dmd/expressionsem.d
@@ -6932,17 +6932,7 @@ private extern (C++) final class ExpressionSemanticVisitor : Visitor
             // Handle this in the glue layer
             e = new TypeidExp(exp.loc, ta);
 
-            bool genObjCode = true;
-
-            // https://issues.dlang.org/show_bug.cgi?id=23650
-            // We generate object code for typeinfo, required
-            // by typeid, only if in non-speculative context
-            if (sc.flags & SCOPE.compile)
-            {
-                genObjCode = false;
-            }
-
-            e.type = getTypeInfoType(exp.loc, ta, sc, genObjCode);
+            e.type = getTypeInfoType(exp.loc, ta, sc);
             semanticTypeInfo(sc, ta);
 
             if (ea)
diff --git a/compiler/src/dmd/frontend.h b/compiler/src/dmd/frontend.h
index 0534b64385d4..9c05ccaa4454 100644
--- a/compiler/src/dmd/frontend.h
+++ b/compiler/src/dmd/frontend.h
@@ -7784,7 +7784,7 @@ extern bool tpsemantic(TemplateParameter* tp, Scope* sc, Array<TemplateParameter
 
 extern bool genTypeInfo(Expression* e, const Loc& loc, Type* torig, Scope* sc);
 
-extern Type* getTypeInfoType(const Loc& loc, Type* t, Scope* sc, bool genObjCode = true);
+extern Type* getTypeInfoType(const Loc& loc, Type* t, Scope* sc);
 
 extern bool isSpeculativeType(Type* t);
 
diff --git a/compiler/src/dmd/todt.d b/compiler/src/dmd/todt.d
index ca73e1e57019..5cd6c7a2f5d6 100644
--- a/compiler/src/dmd/todt.d
+++ b/compiler/src/dmd/todt.d
@@ -1437,6 +1437,13 @@ private extern (C++) class TypeInfoDtVisitor : Visitor
                 /* ti.toObjFile() won't get called. So, store these
                  * member functions into object file in here.
                  */
+
+                if (sd.semanticRun < PASS.semantic3done)
+                {
+                    import dmd.semantic3 : semanticTypeInfoMembers;
+                    semanticTypeInfoMembers(sd);
+                }
+
                 if (sd.xeq && sd.xeq != StructDeclaration.xerreq)
                     toObjFile(sd.xeq, global.params.multiobj);
                 if (sd.xcmp && sd.xcmp != StructDeclaration.xerrcmp)
diff --git a/compiler/src/dmd/typinf.d b/compiler/src/dmd/typinf.d
index 30dc33728f82..3d355a11c1cc 100644
--- a/compiler/src/dmd/typinf.d
+++ b/compiler/src/dmd/typinf.d
@@ -99,14 +99,13 @@ extern (C++) bool genTypeInfo(Expression e, const ref Loc loc, Type torig, Scope
  *      loc = the location for reporting line nunbers in errors
  *      t   = the type to get the type of the `TypeInfo` object for
  *      sc  = the scope
- *      genObjCode = if true, object code will be generated for the obtained TypeInfo
  * Returns:
  *      The type of the `TypeInfo` object associated with `t`
  */
-extern (C++) Type getTypeInfoType(const ref Loc loc, Type t, Scope* sc, bool genObjCode = true)
+extern (C++) Type getTypeInfoType(const ref Loc loc, Type t, Scope* sc)
 {
     assert(t.ty != Terror);
-    if (genTypeInfo(null, loc, t, sc) && genObjCode)
+    if (genTypeInfo(null, loc, t, sc))
     {
         // Find module that will go all the way to an object file
         Module m = sc._module.importedFrom;
diff --git a/compiler/src/dmd/typinf.h b/compiler/src/dmd/typinf.h
index 02a2c7dfa3e5..d23514f62ff9 100644
--- a/compiler/src/dmd/typinf.h
+++ b/compiler/src/dmd/typinf.h
@@ -19,6 +19,6 @@ class FuncDeclaration;
 class ScopeDsymbol;
 
 bool genTypeInfo(Expression *e, const Loc &loc, Type *torig, Scope *sc);
-Type *getTypeInfoType(const Loc &loc, Type *t, Scope *sc, bool genObjCode = true);
+Type *getTypeInfoType(const Loc &loc, Type *t, Scope *sc);
 bool isSpeculativeType(Type *t);
 bool builtinTypeInfo(Type *t);
diff --git a/compiler/src/tests/cxxfrontend.cc b/compiler/src/tests/cxxfrontend.cc
index 567a941fe982..5c215884d161 100644
--- a/compiler/src/tests/cxxfrontend.cc
+++ b/compiler/src/tests/cxxfrontend.cc
@@ -1663,7 +1663,7 @@ void test_typinf(Expression *e, const Loc &loc, Type *t, Scope *sc)
 {
     // Link tests
     genTypeInfo(e, loc, t, sc);
-    getTypeInfoType(loc, t, sc, false);
+    getTypeInfoType(loc, t, sc);
     isSpeculativeType(t);
     builtinTypeInfo(t);
 }
diff --git a/compiler/test/runnable/test23650.d b/compiler/test/runnable/test23650.d
deleted file mode 100644
index 3ce8f5f0759b..000000000000
--- a/compiler/test/runnable/test23650.d
+++ /dev/null
@@ -1,13 +0,0 @@
-// https://issues.dlang.org/show_bug.cgi?id=23650
-
-__gshared int x;
-
-void main()
-{
-
-    static assert(__traits(compiles,
-    {
-        struct S { int *p = &x; }
-        auto t = typeid(S);
-    }));
-}